1 --- glib-2.40.0/glib/grand.c.orig 2014-02-22 16:29:07.000000000 +0100
2 +++ glib-2.40.0/glib/grand.c 2014-03-25 18:45:39.693348981 +0100
11 --- glib-2.44.0/gio/gwin32networking.h.orig 2015-03-20 18:33:38.000000000 +0100
12 +++ glib-2.44.0/gio/gwin32networking.h 2015-03-23 21:03:15.924279829 +0100
14 /* Check if more ANSI-compliant Winsock2 functions are provided */
15 /* For run-time compatibility with Windows XP, remove when XP support dropped */
17 -typedef INT (WSAAPI *PFN_InetPton) (INT, PCTSTR, PVOID);
18 -typedef PCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
19 +typedef ULONG NET_IFINDEX;
20 +typedef INT (WSAAPI *PFN_InetPton) (INT, LPCTSTR, PVOID);
21 +typedef LPCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
22 typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
24 typedef struct _GWin32WinsockFuncs
25 --- glib-2.46.0/glib/gstrfuncs.c.orig 2015-09-12 18:05:31.000000000 +0200
26 +++ glib-2.46.0/glib/gstrfuncs.c 2015-09-22 17:09:13.736714571 +0200
31 -#if defined(G_OS_WIN32)
32 +#if defined(G_OS_WIN32) && !defined(__MINGW32__)
33 strerror_s (buf, sizeof (buf), errnum);
35 #elif defined(HAVE_STRERROR_R)
36 --- glib-2.46.0/gio/gwin32appinfo.c.orig 2015-09-21 14:37:29.000000000 +0200
37 +++ glib-2.46.0/gio/gwin32appinfo.c 2015-09-22 17:34:28.039984356 +0200
39 #include <gio/gwin32registrykey.h>
44 +#ifndef LOAD_LIBRARY_AS_IMAGE_RESOURCE
45 +#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20
48 /* We need to watch 8 places:
49 * 0) HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations
50 --- glib-2.46.0/gio/gwin32registrykey.c.orig 2015-09-21 12:44:58.000000000 +0200
51 +++ glib-2.46.0/gio/gwin32registrykey.c 2015-09-22 18:50:25.926459740 +0200
53 #pragma warning ( disable:4005 )
57 +#include <ddk/ntstatus.h>
58 +#include <ddk/ntddk.h>
59 +#if !defined HKEY_PERFORMANCE_NLSTEXT
60 +#define HKEY_PERFORMANCE_NLSTEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000060) )
62 +#if ! defined HKEY_PERFORMANCE_TEXT
63 +#define HKEY_PERFORMANCE_TEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000050) )
71 +#if !defined(_WDMDDK_) && !defined(__WINDDK_H)
72 typedef enum _KEY_INFORMATION_CLASS {
75 --- glib-2.46.2/glib/gwin32.c.orig 2015-11-05 21:49:18.000000000 +0100
76 +++ glib-2.46.2/glib/gwin32.c 2015-11-08 14:51:02.152308457 +0100
78 #pragma comment (lib, "ntoskrnl.lib")
82 +#include <ddk/ntddk.h>
89 #include "gthreadprivate.h"