---- glib-2.44.0/gio/gwin32networking.h.orig 2015-03-20 18:33:38.000000000 +0100
-+++ glib-2.44.0/gio/gwin32networking.h 2015-03-23 21:03:15.924279829 +0100
-@@ -24,8 +24,9 @@
- /* 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 ULONG NET_IFINDEX;
-+typedef INT (WSAAPI *PFN_InetPton) (INT, LPCTSTR, PVOID);
-+typedef LPCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
- typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
-
- typedef struct _GWin32WinsockFuncs
--- glib-2.58.0/gio/gwin32appinfo.c.orig 2018-08-30 19:12:08.000000000 +0200
+++ glib-2.58.0/gio/gwin32appinfo.c 2018-09-18 20:29:20.206457756 +0200
@@ -22,6 +22,7 @@
#include <string.h>
#include "gcontenttype.h"
---- glib-2.46.0/gio/gwin32registrykey.c.orig 2015-09-21 12:44:58.000000000 +0200
-+++ glib-2.46.0/gio/gwin32registrykey.c 2015-09-22 18:50:25.926459740 +0200
-@@ -25,10 +25,15 @@
+--- glib-2.66.6/gio/gwin32registrykey.c.orig 2021-02-07 19:11:29.468421063 +0100
++++ glib-2.66.6/gio/gwin32registrykey.c 2021-02-07 19:51:00.202244362 +0100
+@@ -25,12 +25,17 @@
#pragma warning ( disable:4005 )
#endif
#include <windows.h>
#include <winternl.h>
+#endif
+ #include "gstrfuncsprivate.h"
+
-#ifndef _WDMDDK_
+#if !defined(_WDMDDK_) && !defined(_DDK_WINDDK_H)
typedef enum _KEY_INFORMATION_CLASS {
KeyBasicInformation,
KeyNodeInformation,
---- glib-2.60.0/glib/gstdio.c.orig 2019-03-04 21:06:14.000000000 +0100
-+++ glib-2.60.0/glib/gstdio.c 2019-03-17 08:35:17.205976417 +0100
-@@ -37,6 +37,11 @@
+--- glib-2.66.8/glib/gstdio.c.orig 2021-03-18 14:47:48.333693500 +0100
++++ glib-2.66.8/glib/gstdio.c 2021-05-22 12:33:01.585554332 +0200
+@@ -39,6 +39,11 @@
#include <io.h>
#include <sys/utime.h>
#include <stdlib.h> /* for MB_CUR_MAX */
#else
#include <utime.h>
#include <errno.h>
-@@ -55,6 +60,7 @@
+@@ -57,6 +62,7 @@
#endif
#if defined (G_OS_WIN32)
/* We can't include Windows DDK and Windows SDK simultaneously,
* so let's copy this here from MinGW-w64 DDK.
-@@ -91,6 +97,7 @@
+@@ -93,6 +99,7 @@ typedef struct _REPARSE_DATA_BUFFER
} GenericReparseBuffer;
};
} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
static int
w32_error_to_errno (DWORD error_code)
-@@ -145,7 +152,7 @@
- return (result - filetime_unix_epoch_offset) / hundreds_of_usec_per_sec;
+@@ -191,7 +198,7 @@ _g_win32_filetime_to_unix_time (const FI
+ return result / hundreds_of_usec_per_sec;
}
-# ifdef _MSC_VER
# ifndef S_IXUSR
# define _S_IRUSR _S_IREAD
# define _S_IWUSR _S_IWRITE
-@@ -153,9 +160,13 @@
+@@ -199,9 +206,13 @@ _g_win32_filetime_to_unix_time (const FI
# define S_IRUSR _S_IRUSR
# define S_IWUSR _S_IWUSR
# define S_IXUSR _S_IXUSR
#include <winsock2.h>
#endif
---- glib-2.60.0/gio/gnetworking.h.in.orig 2018-08-30 19:12:08.000000000 +0200
-+++ glib-2.60.0/gio/gnetworking.h.in 2018-09-18 19:33:44.179829189 +0200
-@@ -29,8 +29,11 @@
+--- glib-2.66.0/gio/gnetworking.h.in.orig 2020-09-10 17:57:49.379170952 +0200
++++ glib-2.66.0/gio/gnetworking.h.in 2020-09-10 18:00:37.804925178 +0200
+@@ -25,8 +25,11 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#include <windns.h>
+#include <winerror.h>
#include <mswsock.h>
+#ifndef __MINGW32__
- @WSPIAPI_INCLUDE@
+ #include <wspiapi.h>
+#endif
#include <iphlpapi.h>
#undef interface
#include <iphlpapi.h>
#include <stdio.h>
---- glib-2.58.3/glib/gutils.h.orig 2019-01-21 14:38:50.000000000 +0100
-+++ glib-2.58.3/glib/gutils.h 2019-01-31 18:01:41.630885345 +0100
-@@ -214,7 +214,7 @@
+--- glib-2.66.8/glib/gutils.h.orig 2021-05-22 12:33:27.583570901 +0200
++++ glib-2.66.8/glib/gutils.h 2021-05-22 12:34:08.529030255 +0200
+@@ -343,7 +343,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
* wants the function to be called when it *itself* exits (or is
* detached, in case the caller, too, is a DLL).
*/
+#if (defined(__MINGW_H) && !defined(_STDLIB_H_) && !defined(_STDLIB_H)) || (defined(_MSC_VER) && !defined(_INC_STDLIB))
int atexit (void (*)(void));
#endif
- #define g_atexit(func) atexit(func)
+ #define g_atexit(func) atexit(func) GLIB_DEPRECATED_MACRO_IN_2_32
--- glib-2.60.0/glib/gstdio-private.c.orig 2019-03-04 21:06:14.000000000 +0100
+++ glib-2.60.0/glib/gstdio-private.c 2019-03-17 08:40:17.301017330 +0100
@@ -17,6 +17,8 @@
if (!failed)
{
---- glib-2.62.0/glib/gwin32.c.orig 2019-09-05 18:56:49.000000000 +0200
-+++ glib-2.62.0/glib/gwin32.c 2019-09-10 19:40:22.822348452 +0200
-@@ -1120,7 +1120,7 @@
- return EXCEPTION_CONTINUE_EXECUTION;
+--- glib-2.66.8/glib/gwin32.c.orig 2021-03-18 14:47:48.347693400 +0100
++++ glib-2.66.8/glib/gwin32.c 2021-05-22 12:35:00.835079487 +0200
+@@ -1109,7 +1109,7 @@ g_win32_veh_handler (PEXCEPTION_POINTERS
+ return EXCEPTION_CONTINUE_SEARCH;
}
- fprintf_s (stderr,
"Exception code=0x%lx flags=0x%lx at 0x%p",
er->ExceptionCode,
er->ExceptionFlags,
-@@ -1129,7 +1129,7 @@
+@@ -1118,7 +1118,7 @@ g_win32_veh_handler (PEXCEPTION_POINTERS
switch (er->ExceptionCode)
{
case EXCEPTION_ACCESS_VIOLATION:
". Access violation - attempting to %s at address 0x%p\n",
er->ExceptionInformation[0] == 0 ? "read data" :
er->ExceptionInformation[0] == 1 ? "write data" :
-@@ -1138,7 +1138,7 @@
+@@ -1127,7 +1127,7 @@ g_win32_veh_handler (PEXCEPTION_POINTERS
(void *) er->ExceptionInformation[1]);
break;
case EXCEPTION_IN_PAGE_ERROR:
". Page access violation - attempting to %s at address 0x%p with status %Ix\n",
er->ExceptionInformation[0] == 0 ? "read from an inaccessible page" :
er->ExceptionInformation[0] == 1 ? "write to an inaccessible page" :
-@@ -1148,7 +1148,7 @@
+@@ -1137,7 +1137,7 @@ g_win32_veh_handler (PEXCEPTION_POINTERS
er->ExceptionInformation[2]);
break;
default: