diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-05-20 22:52:13 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-26 13:09:56 +0530 |
| commit | 00178f8c8e864d7efa7670720d25d4f3759da105 (patch) | |
| tree | c59122780ce8deadad1c9191735f48e72c8427ce | |
| parent | d89c8894a8e1a3298fa1512992b6d053b78964e2 (diff) | |
| download | glib-00178f8c8e864d7efa7670720d25d4f3759da105.tar.gz | |
Fix build error when compiling with mingw
uintptr_t must be defined when including valgrind.h, just move it as
last include solves the problem.
https://bugzilla.gnome.org/show_bug.cgi?id=796283
| -rw-r--r-- | gobject/gclosure.c | 2 | ||||
| -rw-r--r-- | gobject/gtype.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gobject/gclosure.c b/gobject/gclosure.c index b42af60bb..31aa50fb1 100644 --- a/gobject/gclosure.c +++ b/gobject/gclosure.c @@ -22,7 +22,6 @@ #include "config.h" -#include "../glib/valgrind.h" #include <string.h> #include <ffi.h> @@ -35,6 +34,7 @@ #include "gvaluetypes.h" #include "gtype-private.h" +#include "../glib/valgrind.h" /** * SECTION:gclosure diff --git a/gobject/gtype.c b/gobject/gtype.c index 275a8b60b..faf8e38f7 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -21,7 +21,6 @@ #include "config.h" -#include "../glib/valgrind.h" #include <string.h> #include "gtype.h" @@ -38,6 +37,8 @@ #include <windows.h> #endif +#include "../glib/valgrind.h" + #ifdef G_ENABLE_DEBUG #define IF_DEBUG(debug_type) if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) #endif |