luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-26 03:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: prototype _glib_get_dll_directory() and _glib_get_locale_dir()

Browse Source 
Rather than using "extern" declarations of these win32 functions
everywhere they're needed, just prototype them in glib-private.h.
(Which also fixes the fact that they weren't prototyped in the files
where they're defined.)

https://bugzilla.gnome.org/show_bug.cgi?id=688109
This commit is contained in:
Dan Winship
2012-11-10 10:51:18 -05:00
parent 08f4f92fed
commit 3ac6cfaeaa
8 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gdbus-tool.c
View File

@@ -31,6 +31,10 @@
#include <gi18n.h>
#ifdef G_OS_WIN32
#include "glib/glib-private.h"
#endif
/* ---------------------------------------------------------------------------------------------------- */
G_GNUC_UNUSED static void completion_debug (const gchar *format, ...);
@@ -1927,13 +1931,15 @@ main (gint argc, gchar *argv[])
gboolean request_completion;
gchar *completion_cur;
gchar *completion_prev;
#ifdef G_OS_WIN32
gchar *tmp;
#endif
setlocale (LC_ALL, "");
textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32
extern gchar *_glib_get_locale_dir (void);
gchar *tmp = _glib_get_locale_dir ();
tmp = _glib_get_locale_dir ();
bindtextdomain (GETTEXT_PACKAGE, tmp);
g_free (tmp);
#else