diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
| commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
| tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /win32/patches/gwin32networking.h.diff | |
| parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
| parent | 66d524c01720835a30716cb6861606f95629faea (diff) | |
fix conflict
Diffstat (limited to 'win32/patches/gwin32networking.h.diff')
| -rw-r--r-- | win32/patches/gwin32networking.h.diff | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/win32/patches/gwin32networking.h.diff b/win32/patches/gwin32networking.h.diff new file mode 100644 index 0000000..10eb20f --- /dev/null +++ b/win32/patches/gwin32networking.h.diff @@ -0,0 +1,23 @@ +--- gwin32networking.h.0 2015-05-16 15:55:46 -0400 ++++ gwin32networking.h 2015-05-16 16:16:48 -0400 +@@ -19,14 +19,17 @@ + #ifndef __G_WIN32_NETWORKING_H__ + #define __G_WIN32_NETWORKING_H__ + ++#include <windef.h> ++#include <winsock2.h> ++ + G_BEGIN_DECLS + + /* Check if more ANSI-compliant Winsock2 functions are provided */ + /* For run-time compatibility with Windows XP, remove when XP support dropped */ + +-typedef INT (WSAAPI *PFN_InetPton) (INT, PCTSTR, PVOID); +-typedef PCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t); +-typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR); ++typedef INT (WSAAPI *PFN_InetPton) (INT, PCSTR, PVOID); ++typedef PCSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PSTR, size_t); ++typedef ULONG (WINAPI *PFN_IfNameToIndex) (PCSTR); + + typedef struct _GWin32WinsockFuncs + { |