diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-10-17 14:53:58 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-10-17 23:54:05 +0800 |
| commit | b25177fc4f1aaa1daf27791982ecc5e001845d2c (patch) | |
| tree | 291577ce5d5fb035985a789022410a4d8ae99058 | |
| parent | e5fd0f5df6043887a985f922ee4a35b73585ca3e (diff) | |
GLib: Add forgotten includes and build fixes
-gcharset.c, genviron.c, gunicollate.c: Some headers were missed in those
files that triggered C4013 warnings/errors (aka. implicit declaration
of ... in GCC). Make up for them here.
-gwin32.h: Only define g_win32_get_package_installation_directory/
g_win32_get_package_installation_subdirectory as macros
(alias of g_win32_get_package_installation_directory_utf8/
g_win32_get_package_installation_subdirectory_utf8) on Win64 (x64) as
g_win32_get_package_installation_directory/
g_win32_get_package_installation_subdirectory have seperate existing
implmentations for Win32-this is a long-standing problem but was covered-
up by G_DISABLE_DEPRECATED, which we are stopping to use as of 2.31.0.
| -rw-r--r-- | glib/gcharset.c | 3 | ||||
| -rw-r--r-- | glib/genviron.c | 6 | ||||
| -rw-r--r-- | glib/gunicollate.c | 1 | ||||
| -rw-r--r-- | glib/gwin32.h | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/glib/gcharset.c b/glib/gcharset.c index d5e17bfb0..4f52ab4b3 100644 --- a/glib/gcharset.c +++ b/glib/gcharset.c @@ -28,6 +28,9 @@ #include "gmessages.h" #include "gstrfuncs.h" #include "gthread.h" +#ifdef G_OS_WIN32 +#include "gwin32.h" +#endif #include "libcharset/libcharset.h" diff --git a/glib/genviron.c b/glib/genviron.c index bbb5c0f4d..b876451af 100644 --- a/glib/genviron.c +++ b/glib/genviron.c @@ -36,10 +36,16 @@ #ifdef HAVE_CRT_EXTERNS_H #include <crt_externs.h> /* for _NSGetEnviron */ #endif +#ifdef G_OS_WIN32 +#include <windows.h> +#endif #include "gmem.h" #include "gmessages.h" #include "gstrfuncs.h" +#include "gunicode.h" +#include "gconvert.h" +#include "gquark.h" /* Environ array functions {{{1 */ static gint diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 165ecbc25..3649786ec 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -36,6 +36,7 @@ #include "gstring.h" #include "gstrfuncs.h" #include "gtestutils.h" +#include "gcharset.h" #ifndef __STDC_ISO_10646__ #include "gconvert.h" #endif diff --git a/glib/gwin32.h b/glib/gwin32.h index 2d278d2bc..b0fb7c04b 100644 --- a/glib/gwin32.h +++ b/glib/gwin32.h @@ -86,9 +86,11 @@ gchar* g_win32_error_message (gint error); #ifndef G_DISABLE_DEPRECATED #ifndef __GTK_DOC_IGNORE__ +#ifdef _WIN64 #define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8 #define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8 #endif +#endif gchar* g_win32_get_package_installation_directory (const gchar *package, const gchar *dll_name); |