From 52a81a7d86102604729ba07824f1ae6a45b51cea Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 18 Jan 2013 13:27:16 -0500 Subject: [PATCH] Remove a few more G_GNUC_INTERNAL users --- gio/fen/fen-kernel.c | 2 +- gio/inotify/inotify-helper.c | 2 +- glib/gconvert.c | 2 +- glib/gutils.c | 2 +- glib/gwakeup.h | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gio/fen/fen-kernel.c b/gio/fen/fen-kernel.c index f09ebaa..8748a06 100644 --- a/gio/fen/fen-kernel.c +++ b/gio/fen/fen-kernel.c @@ -39,7 +39,7 @@ #define FK_W(...) GAM_DEBUG(DEBUG_INFO, __VA_ARGS__) #endif -G_GNUC_INTERNAL G_LOCK_DEFINE (fen_lock); +G_LOCK_DEFINE (fen_lock); static ulong max_port_events = 512; static GList *pn_visible_list; /* the queue of ports which don't have the max objs */ diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c index 650e88c..f4ef8a4 100644 --- a/gio/inotify/inotify-helper.c +++ b/gio/inotify/inotify-helper.c @@ -55,7 +55,7 @@ static void ih_not_missing_callback (inotify_sub *sub); * * We take the lock in all public functions */ -G_GNUC_INTERNAL G_LOCK_DEFINE (inotify_lock); +G_LOCK_DEFINE (inotify_lock); static GFileMonitorEvent ih_mask_to_EventFlags (guint32 mask); diff --git a/glib/gconvert.c b/glib/gconvert.c index daeb1af..3320a5e 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -229,7 +229,7 @@ try_to_aliases (const char **to_aliases, return FALSE; } -extern const char ** +extern const char ** _g_charset_get_aliases (const char *canonical_name); /** diff --git a/glib/gutils.c b/glib/gutils.c index 3935d04..2e9c95f 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -2422,7 +2422,7 @@ g_get_tmp_dir (void) * equivalent __libc_enable_secure is available). See: * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html */ -G_GNUC_INTERNAL gboolean +gboolean g_check_setuid (void) { /* TODO: get __libc_enable_secure exported from glibc. diff --git a/glib/gwakeup.h b/glib/gwakeup.h index bd94520..d871cdf 100644 --- a/glib/gwakeup.h +++ b/glib/gwakeup.h @@ -26,12 +26,12 @@ typedef struct _GWakeup GWakeup; -G_GNUC_INTERNAL GWakeup * g_wakeup_new (void); -G_GNUC_INTERNAL void g_wakeup_free (GWakeup *wakeup); +GWakeup * g_wakeup_new (void); +void g_wakeup_free (GWakeup *wakeup); -G_GNUC_INTERNAL void g_wakeup_get_pollfd (GWakeup *wakeup, - GPollFD *poll_fd); -G_GNUC_INTERNAL void g_wakeup_signal (GWakeup *wakeup); -G_GNUC_INTERNAL void g_wakeup_acknowledge (GWakeup *wakeup); +void g_wakeup_get_pollfd (GWakeup *wakeup, + GPollFD *poll_fd); +void g_wakeup_signal (GWakeup *wakeup); +void g_wakeup_acknowledge (GWakeup *wakeup); #endif -- 2.7.4