luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-19 08:46:14 +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
Show Stats 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

5
gio/glib-compile-resources.c
View File

@ -47,6 +47,10 @@
#include "gconstructor_as_data.h"
#ifdef G_OS_WIN32
#include "glib/glib-private.h"
#endif
typedef struct
{
char *filename;
@ -625,7 +629,6 @@ main (int argc, char **argv)
};
#ifdef G_OS_WIN32
extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif

5
gio/glib-compile-schemas.c
View File

@ -36,6 +36,10 @@
#include "gvdb/gvdb-builder.h"
#include "strinfo.c"
#ifdef G_OS_WIN32
#include "glib/glib-private.h"
#endif
static void
strip_string (GString *string)
{
@ -2003,7 +2007,6 @@ main (int argc, char **argv)
};
#ifdef G_OS_WIN32
extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif

5
gio/gresource-tool.c
View File

@ -40,6 +40,10 @@
#include <glib/gstdio.h>
#include <gi18n.h>
#ifdef G_OS_WIN32
#include "glib/glib-private.h"
#endif
/* GResource functions {{{1 */
static GResource *
get_resource (const gchar *file)
@ -583,7 +587,6 @@ main (int argc, char *argv[])
void (* function) (const gchar *, const gchar *, const gchar *, gboolean);
#ifdef G_OS_WIN32
extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif

5
gio/gsettings-tool.c
View File

@ -27,6 +27,10 @@
#include <string.h>
#include <stdlib.h>
#ifdef G_OS_WIN32
#include "glib/glib-private.h"
#endif
static gboolean
contained (const gchar * const *items,
const gchar *item)
@ -685,7 +689,6 @@ main (int argc, char **argv)
const gchar *key;
#ifdef G_OS_WIN32
extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif

1
glib/ggettext.c
View File

@ -28,6 +28,7 @@
#include "ggettext.h"
#include "glibintl.h"
#include "glib-private.h"
#include "galloca.h"
#include "gthread.h"

5
glib/glib-private.h
View File

@ -30,6 +30,11 @@ gboolean g_check_setuid (void);
G_GNUC_INTERNAL
GMainContext * g_main_context_new_with_next_id (guint next_id);
#ifdef G_OS_WIN32
gchar *_glib_get_dll_directory (void);
gchar *_glib_get_locale_dir (void);
#endif
#define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol)
typedef struct {

2
glib/gspawn-win32.c
View File

@ -45,6 +45,7 @@
#include "config.h"
#include "glib.h"
#include "glib-private.h"
#include "gprintfint.h"
#include "glibintl.h"
#include "gthread.h"
@ -545,7 +546,6 @@ do_spawn_with_pipes (gint *exit_status,
gchar *helper_process;
CONSOLE_CURSOR_INFO cursor_info;
wchar_t *whelper, **wargv, **wenvp;
extern gchar *_glib_get_dll_directory (void);
gchar *glib_dll_directory;
if (child_setup && !warned_about_child_setup)