GNOME.org
 

[glib] Remove most use of G_GNUC_INTERNAL

commit 6f8f1f7097cbef698b4c7be5816bc9d3864ec744
Author: Colin Walters <walters verbum org>
Date:   Wed Nov 28 12:00:40 2012 -0500

    Remove most use of G_GNUC_INTERNAL
    
    Now that we use an explicit list of symbols to export, the
    G_GNUC_INTERNAL is redundant.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=688681

 gio/gapplicationimpl.h         |    8 --------
 gio/gdbusactiongroup.c         |    2 +-
 gio/gdelayedsettingsbackend.h  |    5 -----
 gio/gregistrysettingsbackend.h |    1 -
 gio/gsettings-mapping.h        |    3 ---
 gio/gsettingsbackendinternal.h |   15 ---------------
 gio/gsettingsschema-internal.h |   15 ---------------
 glib/gcharset.c                |    2 +-
 glib/gcharsetprivate.h         |    3 +--
 glib/gconvert.c                |    2 +-
 glib/glib-init.h               |   12 ++++++------
 glib/glib-private.h            |    3 ---
 glib/gmain.c                   |    2 +-
 glib/gmessages.h               |    2 +-
 glib/gthread-win32.c           |    4 ++--
 glib/gthreadprivate.h          |    7 -------
 glib/gunicodeprivate.h         |    5 ++---
 glib/gvariant-core.h           |    3 ---
 18 files changed, 16 insertions(+), 78 deletions(-)
---
diff --git a/gio/gapplicationimpl.h b/gio/gapplicationimpl.h
index acf3c53..8743d0f 100644
--- a/gio/gapplicationimpl.h
+++ b/gio/gapplicationimpl.h
@@ -11,10 +11,8 @@ typedef struct
   GVariant     *state;
 } RemoteActionInfo;
 
-G_GNUC_INTERNAL
 void                    g_application_impl_destroy                      (GApplicationImpl   *impl);
 
-G_GNUC_INTERNAL
 GApplicationImpl *      g_application_impl_register                     (GApplication        *application,
                                                                          const gchar         *appid,
                                                                          GApplicationFlags    flags,
@@ -23,27 +21,21 @@ GApplicationImpl *      g_application_impl_register                     (GApplic
                                                                          GCancellable        *cancellable,
                                                                          GError             **error);
 
-G_GNUC_INTERNAL
 void                    g_application_impl_activate                     (GApplicationImpl   *impl,
                                                                          GVariant           *platform_data);
 
-G_GNUC_INTERNAL
 void                    g_application_impl_open                         (GApplicationImpl   *impl,
                                                                          GFile             **files,
                                                                          gint                n_files,
                                                                          const gchar        *hint,
                                                                          GVariant           *platform_data);
 
-G_GNUC_INTERNAL
 int                     g_application_impl_command_line                 (GApplicationImpl   *impl,
                                                                          gchar             **arguments,
                                                                          GVariant           *platform_data);
 
-G_GNUC_INTERNAL
 void                    g_application_impl_flush                        (GApplicationImpl   *impl);
 
-G_GNUC_INTERNAL
 GDBusConnection *       g_application_impl_get_dbus_connection          (GApplicationImpl   *impl);
 
-G_GNUC_INTERNAL
 const gchar *           g_application_impl_get_dbus_object_path         (GApplicationImpl   *impl);
diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c
index b73b736..a3deb04 100644
--- a/gio/gdbusactiongroup.c
+++ b/gio/gdbusactiongroup.c
@@ -505,7 +505,7 @@ g_dbus_action_group_get (GDBusConnection *connection,
   return group;
 }
 
-G_GNUC_INTERNAL gboolean
+gboolean
 g_dbus_action_group_sync (GDBusActionGroup  *group,
                           GCancellable      *cancellable,
                           GError           **error)
diff --git a/gio/gdelayedsettingsbackend.h b/gio/gdelayedsettingsbackend.h
index 34ec3ef..92a4851 100644
--- a/gio/gdelayedsettingsbackend.h
+++ b/gio/gdelayedsettingsbackend.h
@@ -56,17 +56,12 @@ struct _GDelayedSettingsBackend
   GDelayedSettingsBackendPrivate *priv;
 };
 
-G_GNUC_INTERNAL
 GType                           g_delayed_settings_backend_get_type     (void);
-G_GNUC_INTERNAL
 GDelayedSettingsBackend *       g_delayed_settings_backend_new          (GSettingsBackend        *backend,
                                                                          gpointer                 owner,
                                                                          GMainContext            *owner_context);
-G_GNUC_INTERNAL
 void                            g_delayed_settings_backend_revert       (GDelayedSettingsBackend *delayed);
-G_GNUC_INTERNAL
 void                            g_delayed_settings_backend_apply        (GDelayedSettingsBackend *delayed);
-G_GNUC_INTERNAL
 gboolean                        g_delayed_settings_backend_get_has_unapplied (GDelayedSettingsBackend *delayed);
 
 #endif  /* __G_DELAYED_SETTINGS_BACKEND_H__ */
diff --git a/gio/gregistrysettingsbackend.h b/gio/gregistrysettingsbackend.h
index cd7bd7c..faba639 100644
--- a/gio/gregistrysettingsbackend.h
+++ b/gio/gregistrysettingsbackend.h
@@ -24,7 +24,6 @@
 
 #include <glib-object.h>
 
-G_GNUC_INTERNAL
 GType g_registry_backend_get_type (void);
 
 
diff --git a/gio/gsettings-mapping.h b/gio/gsettings-mapping.h
index 18ce318..ad8f59e 100644
--- a/gio/gsettings-mapping.h
+++ b/gio/gsettings-mapping.h
@@ -24,15 +24,12 @@
 
 #include <glib-object.h>
 
-G_GNUC_INTERNAL
 GVariant *              g_settings_set_mapping                          (const GValue       *value,
                                                                          const GVariantType *expected_type,
                                                                          gpointer            user_data);
-G_GNUC_INTERNAL
 gboolean                g_settings_get_mapping                          (GValue             *value,
                                                                          GVariant           *variant,
                                                                          gpointer            user_data);
-G_GNUC_INTERNAL
 gboolean                g_settings_mapping_is_compatible                (GType               gvalue_type,
                                                                          const GVariantType *variant_type);
 
diff --git a/gio/gsettingsbackendinternal.h b/gio/gsettingsbackendinternal.h
index 368c54b..f782c7c 100644
--- a/gio/gsettingsbackendinternal.h
+++ b/gio/gsettingsbackendinternal.h
@@ -49,59 +49,44 @@ typedef struct
                                   const gchar         *path);
 } GSettingsListenerVTable;
 
-G_GNUC_INTERNAL
 void                    g_settings_backend_watch                        (GSettingsBackend               *backend,
                                                                          const GSettingsListenerVTable  *vtable,
                                                                          GObject                        *target,
                                                                          GMainContext                   *context);
-G_GNUC_INTERNAL
 void                    g_settings_backend_unwatch                      (GSettingsBackend               *backend,
                                                                          GObject                        *target);
 
-G_GNUC_INTERNAL
 GTree *                 g_settings_backend_create_tree                  (void);
 
-G_GNUC_INTERNAL
 GVariant *              g_settings_backend_read                         (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          const GVariantType             *expected_type,
                                                                          gboolean                        default_value);
-G_GNUC_INTERNAL
 gboolean                g_settings_backend_write                        (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          GVariant                       *value,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 gboolean                g_settings_backend_write_tree                   (GSettingsBackend               *backend,
                                                                          GTree                          *tree,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 void                    g_settings_backend_reset                        (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 gboolean                g_settings_backend_get_writable                 (GSettingsBackend               *backend,
                                                                          const char                     *key);
-G_GNUC_INTERNAL
 void                    g_settings_backend_unsubscribe                  (GSettingsBackend               *backend,
                                                                          const char                     *name);
-G_GNUC_INTERNAL
 void                    g_settings_backend_subscribe                    (GSettingsBackend               *backend,
                                                                          const char                     *name);
-G_GNUC_INTERNAL
 GPermission *           g_settings_backend_get_permission               (GSettingsBackend               *backend,
                                                                          const gchar                    *path);
-G_GNUC_INTERNAL
 void                    g_settings_backend_sync_default                 (void);
 
-G_GNUC_INTERNAL
 GType                   g_null_settings_backend_get_type                (void);
 
-G_GNUC_INTERNAL
 GType                   g_memory_settings_backend_get_type              (void);
 
 #ifdef HAVE_COCOA
-G_GNUC_INTERNAL
 GType                   g_nextstep_settings_backend_get_type            (void);
 #endif
 
diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h
index f9d79eb..7b002c2 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.h
@@ -41,49 +41,34 @@ typedef struct
   GVariant *default_value;
 } GSettingsSchemaKey;
 
-G_GNUC_INTERNAL
 const gchar *           g_settings_schema_get_gettext_domain            (GSettingsSchema  *schema);
-G_GNUC_INTERNAL
 GVariantIter *          g_settings_schema_get_value                     (GSettingsSchema  *schema,
                                                                          const gchar      *key);
-G_GNUC_INTERNAL
 gboolean                g_settings_schema_has_key                       (GSettingsSchema  *schema,
                                                                          const gchar      *key);
-G_GNUC_INTERNAL
 const GQuark *          g_settings_schema_list                          (GSettingsSchema  *schema,
                                                                          gint             *n_items);
-G_GNUC_INTERNAL
 const gchar *           g_settings_schema_get_string                    (GSettingsSchema  *schema,
                                                                          const gchar      *key);
 
-G_GNUC_INTERNAL
 void                    g_settings_schema_key_init                      (GSettingsSchemaKey *key,
                                                                          GSettingsSchema    *schema,
                                                                          const gchar        *name);
-G_GNUC_INTERNAL
 void                    g_settings_schema_key_clear                     (GSettingsSchemaKey *key);
-G_GNUC_INTERNAL
 gboolean                g_settings_schema_key_type_check                (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
-G_GNUC_INTERNAL
 gboolean                g_settings_schema_key_range_check               (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
-G_GNUC_INTERNAL
 GVariant *              g_settings_schema_key_range_fixup               (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
-G_GNUC_INTERNAL
 GVariant *              g_settings_schema_key_get_translated_default    (GSettingsSchemaKey *key);
 
-G_GNUC_INTERNAL
 gint                    g_settings_schema_key_to_enum                   (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
-G_GNUC_INTERNAL
 GVariant *              g_settings_schema_key_from_enum                 (GSettingsSchemaKey *key,
                                                                          gint                value);
-G_GNUC_INTERNAL
 guint                   g_settings_schema_key_to_flags                  (GSettingsSchemaKey *key,
                                                                          GVariant           *value);
-G_GNUC_INTERNAL
 GVariant *              g_settings_schema_key_from_flags                (GSettingsSchemaKey *key,
                                                                          guint               value);
 
diff --git a/glib/gcharset.c b/glib/gcharset.c
index cb08027..3fca455 100644
--- a/glib/gcharset.c
+++ b/glib/gcharset.c
@@ -87,7 +87,7 @@ get_alias_hash (void)
 /* As an abuse of the alias table, the following routines gets
  * the charsets that are aliases for the canonical name.
  */
-G_GNUC_INTERNAL const char **
+const char **
 _g_charset_get_aliases (const char *canonical_name)
 {
   GHashTable *alias_hash = get_alias_hash ();
diff --git a/glib/gcharsetprivate.h b/glib/gcharsetprivate.h
index 17a867f..aea1384 100644
--- a/glib/gcharsetprivate.h
+++ b/glib/gcharsetprivate.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-G_GNUC_INTERNAL const char ** _g_charset_get_aliases (const char *canonical_name);
-;
+const char ** _g_charset_get_aliases (const char *canonical_name);
 
 G_END_DECLS
 
diff --git a/glib/gconvert.c b/glib/gconvert.c
index f189c24..daeb1af 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -229,7 +229,7 @@ try_to_aliases (const char **to_aliases,
   return FALSE;
 }
 
-G_GNUC_INTERNAL extern const char ** 
+extern const char ** 
 _g_charset_get_aliases (const char *canonical_name);
 
 /**
diff --git a/glib/glib-init.h b/glib/glib-init.h
index bf1ecd0..016465f 100644
--- a/glib/glib-init.h
+++ b/glib/glib-init.h
@@ -24,17 +24,17 @@
 
 #include "gmessages.h"
 
-G_GNUC_INTERNAL extern GLogLevelFlags g_log_always_fatal;
-G_GNUC_INTERNAL extern GLogLevelFlags g_log_msg_prefix;
+extern GLogLevelFlags g_log_always_fatal;
+extern GLogLevelFlags g_log_msg_prefix;
 GLIB_VAR gboolean g_mem_gc_friendly;
 
 #ifdef G_OS_WIN32
 #include <windows.h>
 
-G_GNUC_INTERNAL void g_thread_win32_thread_detach (void);
-G_GNUC_INTERNAL void g_thread_win32_init (void);
-G_GNUC_INTERNAL void g_clock_win32_init (void);
-G_GNUC_INTERNAL extern HMODULE glib_dll;
+void g_thread_win32_thread_detach (void);
+void g_thread_win32_init (void);
+void g_clock_win32_init (void);
+extern HMODULE glib_dll;
 #endif
 
 #endif /* __GLIB_INIT_H__ */
diff --git a/glib/glib-private.h b/glib/glib-private.h
index f346e1d..7e2e61e 100644
--- a/glib/glib-private.h
+++ b/glib/glib-private.h
@@ -23,11 +23,8 @@
 #include <glib.h>
 #include "gwakeup.h"
 
-G_GNUC_INTERNAL
 GMainContext *          g_get_worker_context            (void);
-G_GNUC_INTERNAL
 gboolean                g_check_setuid                  (void);
-G_GNUC_INTERNAL
 GMainContext *          g_main_context_new_with_next_id (guint next_id);
 
 #ifdef G_OS_WIN32
diff --git a/glib/gmain.c b/glib/gmain.c
index 5807efd..9f9eccc 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2485,7 +2485,7 @@ g_get_real_time (void)
 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
 static guint32 g_win32_tick_epoch = 0;
 
-G_GNUC_INTERNAL void
+void
 g_clock_win32_init (void)
 {
   HMODULE kernel32;
diff --git a/glib/gmessages.h b/glib/gmessages.h
index d56deae..e2d98e4 100644
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -116,7 +116,7 @@ GLIB_AVAILABLE_IN_ALL
 GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 
 /* internal */
-G_GNUC_INTERNAL void	_g_log_fallback_handler	(const gchar   *log_domain,
+void	_g_log_fallback_handler	(const gchar   *log_domain,
 						 GLogLevelFlags log_level,
 						 const gchar   *message,
 						 gpointer       unused_data);
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 50b72c2..c54f2bd 100644
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -983,7 +983,7 @@ g_thread_lookup_native_funcs (void)
   return TRUE;
 }
 
-G_GNUC_INTERNAL void
+void
 g_thread_win32_init (void)
 {
   if (!g_thread_lookup_native_funcs ())
@@ -992,7 +992,7 @@ g_thread_win32_init (void)
   InitializeCriticalSection (&g_private_lock);
 }
 
-G_GNUC_INTERNAL void
+void
 g_thread_win32_thread_detach (void)
 {
   gboolean dtors_called;
diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
index 6b974de..15584f4 100644
--- a/glib/gthreadprivate.h
+++ b/glib/gthreadprivate.h
@@ -37,24 +37,18 @@ struct  _GRealThread
 };
 
 /* system thread implementation (gthread-posix.c, gthread-win32.c) */
-G_GNUC_INTERNAL
 void            g_system_thread_wait            (GRealThread  *thread);
 
-G_GNUC_INTERNAL
 GRealThread *   g_system_thread_new             (GThreadFunc   func,
                                                  gulong        stack_size,
                                                  GError      **error);
-G_GNUC_INTERNAL
 void            g_system_thread_free            (GRealThread  *thread);
 
-G_GNUC_INTERNAL
 void            g_system_thread_exit            (void);
-G_GNUC_INTERNAL
 void            g_system_thread_set_name        (const gchar  *name);
 
 
 /* gthread.c */
-G_GNUC_INTERNAL
 GThread *       g_thread_new_internal           (const gchar  *name,
                                                  GThreadFunc   proxy,
                                                  GThreadFunc   func,
@@ -62,7 +56,6 @@ GThread *       g_thread_new_internal           (const gchar  *name,
                                                  gsize         stack_size,
                                                  GError      **error);
 
-G_GNUC_INTERNAL
 gpointer        g_thread_proxy                  (gpointer      thread);
 
 #endif /* __G_THREADPRIVATE_H__ */
diff --git a/glib/gunicodeprivate.h b/glib/gunicodeprivate.h
index c6cca84..c5af3b5 100644
--- a/glib/gunicodeprivate.h
+++ b/glib/gunicodeprivate.h
@@ -25,9 +25,8 @@
 
 G_BEGIN_DECLS
 
-G_GNUC_INTERNAL gunichar *_g_utf8_normalize_wc
-				(const gchar    *str,
-				gssize          max_len,
+gunichar *_g_utf8_normalize_wc (const gchar    *str,
+                                gssize          max_len,
 				GNormalizeMode  mode);
 
 G_END_DECLS
diff --git a/glib/gvariant-core.h b/glib/gvariant-core.h
index d2a6b46..d5a653d 100644
--- a/glib/gvariant-core.h
+++ b/glib/gvariant-core.h
@@ -27,16 +27,13 @@
 
 /* gvariant-core.c */
 
-G_GNUC_INTERNAL
 GVariant *              g_variant_new_from_children                     (const GVariantType  *type,
                                                                          GVariant           **children,
                                                                          gsize                n_children,
                                                                          gboolean             trusted);
 
-G_GNUC_INTERNAL
 gboolean                g_variant_is_trusted                            (GVariant            *value);
 
-G_GNUC_INTERNAL
 GVariantTypeInfo *      g_variant_get_type_info                         (GVariant            *value);
 
 #endif /* __G_VARIANT_CORE_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]