diff options
| author | Dan Winship <danw@gnome.org> | 2012-11-15 18:18:54 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2012-11-16 08:22:06 -0500 |
| commit | 03ef7ba5abab928c17142f553f86b97d28ecf946 (patch) | |
| tree | 36d9ccd6d3af8241419585eff5d5cea18d2c4fe2 /glib/glib.h | |
| parent | 834e6e96b355d7b313f59eef3c90a68bc5463365 (diff) | |
| download | glib-03ef7ba5abab928c17142f553f86b97d28ecf946.tar.gz | |
win32: re-fix the _utf8 compat function situation
The previous fix didn't work, because every place within glib that
used any of the functions also needed to be including win32compat.h.
So, move the prototypes back to their original headers (but at least
all in one place at the bottom).
https://bugzilla.gnome.org/show_bug.cgi?id=688109
Diffstat (limited to 'glib/glib.h')
| -rw-r--r-- | glib/glib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/glib/glib.h b/glib/glib.h index 71fe3588d..77abf2329 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -107,10 +107,6 @@ #include <glib/deprecated/grel.h> #include <glib/deprecated/gthread.h> -#ifdef G_OS_WIN32 -#include <glib/gwin32compat.h> -#endif - #undef __GLIB_H_INSIDE__ #endif /* __G_LIB_H__ */ |