diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-11-11 22:14:24 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-11-11 22:14:24 +0100 |
| commit | dafb7791fe856930db432643276bc182a487c4c1 (patch) | |
| tree | 44754eaaaaab4ff06f1245f65abafa66fadb35c9 | |
| parent | 449b65a32f93e4ba2761fbb49aa08142ae8b4981 (diff) | |
glib: Remove obsolete patch that broke the build on Windows
| -rw-r--r-- | recipes/build-tools/glib-tools.recipe | 1 | ||||
| -rw-r--r-- | recipes/glib.recipe | 1 | ||||
| -rw-r--r-- | recipes/glib/0020-Include-ntdef.h-for-NTSTATUS.patch | 27 |
3 files changed, 0 insertions, 29 deletions
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe index b0636ecc..fba17a04 100644 --- a/recipes/build-tools/glib-tools.recipe +++ b/recipes/build-tools/glib-tools.recipe @@ -20,7 +20,6 @@ class Recipe(recipe.Recipe): "../glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch", '../glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch', '../glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch', - '../glib/0020-Include-ntdef.h-for-NTSTATUS.patch', '../glib/0030-Library-ctor-order.patch' ] diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 5c0f09bb..8127d293 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -36,7 +36,6 @@ class Recipe(recipe.Recipe): "glib/0009-Unhide-_g_io_modules_ensure_extension_points_registe.patch", 'glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch', 'glib/0015-Implementation-of-Cocoa-event-loop-integration-in-GM.patch', - 'glib/0020-Include-ntdef.h-for-NTSTATUS.patch', 'glib/0030-Library-ctor-order.patch' ] diff --git a/recipes/glib/0020-Include-ntdef.h-for-NTSTATUS.patch b/recipes/glib/0020-Include-ntdef.h-for-NTSTATUS.patch deleted file mode 100644 index 80b661e9..00000000 --- a/recipes/glib/0020-Include-ntdef.h-for-NTSTATUS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 70aea6bcd4cf340623435269cbc797adfc84aa8b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> -Date: Tue, 20 Oct 2015 17:36:33 +0300 -Subject: [PATCH] Include ntdef.h for NTSTATUS - ---- - glib/gwin32.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/glib/gwin32.c b/glib/gwin32.c -index 7781c04..a0cbd1d 100644 ---- a/glib/gwin32.c -+++ b/glib/gwin32.c -@@ -51,6 +51,10 @@ - - #define MODERN_API_FAMILY 2 - -+#if WINAPI_FAMILY != MODERN_API_FAMILY -+# include <ntdef.h> -+#endif -+ - #if WINAPI_FAMILY == MODERN_API_FAMILY - /* This is for modern UI Builds, where we can't use LoadLibraryW()/GetProcAddress() */ - /* ntddk.h is found in the WDK, and MinGW */ --- -2.6.1 - |