---- glib-2.40.0/glib/grand.c.orig 2014-02-22 16:29:07.000000000 +0100
-+++ glib-2.40.0/glib/grand.c 2014-03-25 18:45:39.693348981 +0100
-@@ -55,6 +55,7 @@
- #endif
-
- #ifdef G_OS_WIN32
-+#include <windows.h>
- #include <stdlib.h>
- #endif
-
--- 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 @@
typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
typedef struct _GWin32WinsockFuncs
---- glib-2.46.0/glib/gstrfuncs.c.orig 2015-09-12 18:05:31.000000000 +0200
-+++ glib-2.46.0/glib/gstrfuncs.c 2015-09-22 17:09:13.736714571 +0200
-@@ -1272,7 +1272,7 @@
- gchar buf[1024];
- GError *error = NULL;
-
--#if defined(G_OS_WIN32)
-+#if defined(G_OS_WIN32) && !defined(__MINGW32__)
- strerror_s (buf, sizeof (buf), errnum);
- msg = buf;
- #elif defined(HAVE_STRERROR_R)
---- glib-2.46.0/gio/gwin32appinfo.c.orig 2015-09-21 14:37:29.000000000 +0200
-+++ glib-2.46.0/gio/gwin32appinfo.c 2015-09-22 17:34:28.039984356 +0200
-@@ -34,6 +34,11 @@
- #include <gio/gwin32registrykey.h>
+--- 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 <windows.h>
-+#include <wchar.h>
-+
-+#ifndef LOAD_LIBRARY_AS_IMAGE_RESOURCE
-+#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20
-+#endif
+ #include "config.h"
- /* We need to watch 8 places:
- * 0) HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations
++#include <wctype.h>
+ #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,21 @@
+@@ -25,10 +25,15 @@
#pragma warning ( disable:4005 )
#endif
#include <windows.h>
+#ifdef __MINGW32__
+#include <ddk/ntstatus.h>
+#include <ddk/ntddk.h>
-+#if !defined HKEY_PERFORMANCE_NLSTEXT
-+#define HKEY_PERFORMANCE_NLSTEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000060) )
-+#endif
-+#if ! defined HKEY_PERFORMANCE_TEXT
-+#define HKEY_PERFORMANCE_TEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000050) )
-+#endif
+#else
#include <ntstatus.h>
#include <winternl.h>
+#endif
-#ifndef _WDMDDK_
-+#if !defined(_WDMDDK_) && !defined(__WINDDK_H)
++#if !defined(_WDMDDK_) && !defined(_DDK_WINDDK_H)
typedef enum _KEY_INFORMATION_CLASS {
KeyBasicInformation,
KeyNodeInformation,
---- glib-2.46.2/glib/gwin32.c.orig 2015-11-05 21:49:18.000000000 +0100
-+++ glib-2.46.2/glib/gwin32.c 2015-11-08 14:51:02.152308457 +0100
-@@ -60,8 +60,12 @@
- #pragma comment (lib, "ntoskrnl.lib")
- #endif
+--- 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 @@
+ #include <io.h>
+ #include <sys/utime.h>
+ #include <stdlib.h> /* for MB_CUR_MAX */
++#include <ctype.h>
++#include <malloc.h>
++#ifdef __MINGW32__
++#include <winioctl.h>
++#endif
#else
+ #include <utime.h>
+ #include <errno.h>
+@@ -55,6 +60,7 @@
+ #endif
+
+ #if defined (G_OS_WIN32)
++# if !defined(__MINGW32__)
+
+ /* We can't include Windows DDK and Windows SDK simultaneously,
+ * so let's copy this here from MinGW-w64 DDK.
+@@ -91,6 +97,7 @@
+ } GenericReparseBuffer;
+ };
+ } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
++# endif
+
+ static int
+ w32_error_to_errno (DWORD error_code)
+@@ -145,7 +152,7 @@
+ return (result - filetime_unix_epoch_offset) / hundreds_of_usec_per_sec;
+ }
+
+-# ifdef _MSC_VER
++# if defined(_MSC_VER) || defined(__MINGW32__)
+ # ifndef S_IXUSR
+ # define _S_IRUSR _S_IREAD
+ # define _S_IWUSR _S_IWRITE
+@@ -153,9 +160,13 @@
+ # define S_IRUSR _S_IRUSR
+ # define S_IWUSR _S_IWUSR
+ # define S_IXUSR _S_IXUSR
++# endif
++# ifndef S_IXGRP
+ # define S_IRGRP (S_IRUSR >> 3)
+ # define S_IWGRP (S_IWUSR >> 3)
+ # define S_IXGRP (S_IXUSR >> 3)
++# endif
++# ifndef S_IXOTH
+ # define S_IROTH (S_IRGRP >> 3)
+ # define S_IWOTH (S_IWGRP >> 3)
+ # define S_IXOTH (S_IXGRP >> 3)
+--- glib-2.58.0/glib/giowin32.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/glib/giowin32.c 2018-09-15 10:12:54.423173008 +0200
+@@ -70,6 +70,7 @@
+ #include "glib.h"
+
+ #include <stdlib.h>
++#include <winerror.h>
+ #include <winsock2.h>
+ #include <windows.h>
+ #include <conio.h>
+--- glib-2.58.0/gio/gioerror.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/gio/gioerror.c 2018-09-17 20:04:51.387461074 +0200
+@@ -23,6 +23,7 @@
+ #include "gioerror.h"
+
+ #ifdef G_OS_WIN32
++#include <winerror.h>
+ #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 @@
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #include <windns.h>
++#include <winerror.h>
+ #include <mswsock.h>
++#ifndef __MINGW32__
+ @WSPIAPI_INCLUDE@
++#endif
+ #include <iphlpapi.h>
+ #undef interface
+
+--- glib-2.58.0/gio/gwin32networkmonitor.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/gio/gwin32networkmonitor.c 2018-09-26 17:22:59.000209749 +0200
+@@ -28,6 +28,7 @@
+
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
++#include <netioapi.h>
+ #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 @@
+ * 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(_MSC_VER) && !defined(_INC_STDLIB))
++#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)
+--- 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 @@
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <wctype.h>
++
+ /* Strips "\\\\?\\" extended prefix or
+ * "\\??\\" NT Object Manager prefix from
+ * @str in-place, using memmove.
+--- glib-2.60.0/gio/tests/g-file-info.c.orig 2019-03-04 21:06:14.000000000 +0100
++++ glib-2.60.0/gio/tests/g-file-info.c 2019-03-17 20:58:44.544317727 +0100
+@@ -30,6 +30,9 @@
+ #include <stdio.h>
+ #include <glib/gstdio.h>
+ #include <windows.h>
+#ifdef __MINGW32__
-+#include <ddk/ntddk.h>
-+#else
- #include <winternl.h>
++#include <winioctl.h>
++#endif
+ #include <shlobj.h>
+ #include <io.h> /* for _get_osfhandle */
#endif
+--- glib-2.60.0/gio/tests/network-address.c.orig 2019-03-04 21:06:14.000000000 +0100
++++ glib-2.60.0/gio/tests/network-address.c 2019-03-17 21:18:09.974670716 +0100
+@@ -3,6 +3,9 @@
+
+ #include <gio/gio.h>
+ #include <gio/gnetworking.h>
++#ifdef __MINGW32__
++#include <ntddndis.h>
+#endif
- #include "glib.h"
- #include "gthreadprivate.h"
+ static void
+ test_basic (void)
projects / packages / crossmingw32-glib2.git / blobdiff