Author: olivier
Date: 2008-11-08 10:51:18 +0000 (Sat, 08 Nov 2008)
New Revision: 28660
Modified:
libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
Log:
Place G_GNUC_INTERNAL before the function declaration for Sun Studio
compatibility - Patch from William Bonnet <[EMAIL PROTECTED]> (Bug #4580)
Modified: libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
===================================================================
--- libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
2008-11-08 08:39:53 UTC (rev 28659)
+++ libxfce4util/branches/xfce_4_4/libxfce4util/libxfce4util-private.h
2008-11-08 10:51:18 UTC (rev 28660)
@@ -30,7 +30,7 @@
G_BEGIN_DECLS;
-void _xfce_i18n_init (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void _xfce_i18n_init (void);
G_END_DECLS;
Modified: libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
===================================================================
--- libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
2008-11-08 08:39:53 UTC (rev 28659)
+++ libxfce4util/branches/xfce_4_4/libxfce4util/xfce-rc-private.h
2008-11-08 10:51:18 UTC (rev 28660)
@@ -61,71 +61,71 @@
#define XFCE_RC_SIMPLE_CONST(obj) ((const XfceRcSimple *) (obj))
-void _xfce_rc_init (XfceRc *rc) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void _xfce_rc_init (XfceRc *rc);
-XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple *shared,
+G_GNUC_INTERNAL XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple
*shared,
const gchar *filename,
- gboolean readonly)
G_GNUC_INTERNAL;
-gboolean _xfce_rc_simple_parse (XfceRcSimple *simple)
G_GNUC_INTERNAL;
-void _xfce_rc_simple_close (XfceRc *rc) G_GNUC_INTERNAL;
-void _xfce_rc_simple_flush (XfceRc *rc) G_GNUC_INTERNAL;
-void _xfce_rc_simple_rollback (XfceRc *rc) G_GNUC_INTERNAL;
-gboolean _xfce_rc_simple_is_dirty (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gboolean _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-const gchar* _xfce_rc_simple_get_filename(const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gchar** _xfce_rc_simple_get_groups (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gchar** _xfce_rc_simple_get_entries (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST
G_GNUC_INTERNAL;
-void _xfce_rc_simple_delete_group(XfceRc *rc,
+ gboolean readonly);
+G_GNUC_INTERNAL gboolean _xfce_rc_simple_parse (XfceRcSimple
*simple);
+G_GNUC_INTERNAL void _xfce_rc_simple_close (XfceRc *rc);
+G_GNUC_INTERNAL void _xfce_rc_simple_flush (XfceRc *rc);
+G_GNUC_INTERNAL void _xfce_rc_simple_rollback (XfceRc *rc);
+G_GNUC_INTERNAL gboolean _xfce_rc_simple_is_dirty (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gboolean _xfce_rc_simple_is_readonly (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL const gchar* _xfce_rc_simple_get_filename(const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_groups (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_entries (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_simple_delete_group(XfceRc *rc,
const gchar *name,
- gboolean global)
G_GNUC_INTERNAL;
+ gboolean global);
const gchar* _xfce_rc_simple_get_group (const XfceRc *rc) G_GNUC_CONST;
-gboolean _xfce_rc_simple_has_group (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST
G_GNUC_INTERNAL;
-void _xfce_rc_simple_set_group (XfceRc *rc,
- const gchar *name) G_GNUC_INTERNAL;
-void _xfce_rc_simple_delete_entry(XfceRc *rc,
+G_GNUC_INTERNAL gboolean _xfce_rc_simple_has_group (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_simple_set_group (XfceRc *rc,
+ const gchar *name);
+G_GNUC_INTERNAL void _xfce_rc_simple_delete_entry(XfceRc *rc,
const gchar *key,
- gboolean global)
G_GNUC_INTERNAL;
-gboolean _xfce_rc_simple_has_entry (const XfceRc *rc,
- const gchar *key) G_GNUC_CONST
G_GNUC_INTERNAL;
-const gchar* _xfce_rc_simple_read_entry (const XfceRc *rc,
+ gboolean global);
+G_GNUC_INTERNAL gboolean _xfce_rc_simple_has_entry (const XfceRc *rc,
+ const gchar *key) G_GNUC_CONST;
+G_GNUC_INTERNAL const gchar* _xfce_rc_simple_read_entry (const XfceRc *rc,
const gchar *key,
- gboolean translated)
G_GNUC_CONST G_GNUC_INTERNAL;
-void _xfce_rc_simple_write_entry (XfceRc *rc,
+ gboolean translated)
G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_simple_write_entry (XfceRc *rc,
const gchar *key,
- const gchar *value)
G_GNUC_INTERNAL;
+ const gchar *value);
-XfceRcConfig* _xfce_rc_config_new (XfceResourceType type,
+G_GNUC_INTERNAL XfceRcConfig* _xfce_rc_config_new (XfceResourceType
type,
const gchar *resource,
- gboolean readonly)
G_GNUC_INTERNAL;
-void _xfce_rc_config_close (XfceRc *rc) G_GNUC_INTERNAL;
-void _xfce_rc_config_flush (XfceRc *rc) G_GNUC_INTERNAL;
-void _xfce_rc_config_rollback (XfceRc *rc) G_GNUC_INTERNAL;
-gboolean _xfce_rc_config_is_dirty (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gboolean _xfce_rc_config_is_readonly (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gchar** _xfce_rc_config_get_groups (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gchar** _xfce_rc_config_get_entries (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST
G_GNUC_INTERNAL;
-void _xfce_rc_config_delete_group(XfceRc *rc,
+ gboolean readonly);
+G_GNUC_INTERNAL void _xfce_rc_config_close (XfceRc *rc);
+G_GNUC_INTERNAL void _xfce_rc_config_flush (XfceRc *rc);
+G_GNUC_INTERNAL void _xfce_rc_config_rollback (XfceRc *rc);
+G_GNUC_INTERNAL gboolean _xfce_rc_config_is_dirty (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gboolean _xfce_rc_config_is_readonly (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar** _xfce_rc_config_get_groups (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gchar** _xfce_rc_config_get_entries (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_config_delete_group(XfceRc *rc,
const gchar *name,
- gboolean global)
G_GNUC_INTERNAL;
-const gchar* _xfce_rc_config_get_group (const XfceRc *rc) G_GNUC_CONST
G_GNUC_INTERNAL;
-gboolean _xfce_rc_config_has_group (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST
G_GNUC_INTERNAL;
-void _xfce_rc_config_set_group (XfceRc *rc,
- const gchar *name) G_GNUC_INTERNAL;
-void _xfce_rc_config_delete_entry(XfceRc *rc,
+ gboolean global);
+G_GNUC_INTERNAL const gchar* _xfce_rc_config_get_group (const XfceRc *rc)
G_GNUC_CONST;
+G_GNUC_INTERNAL gboolean _xfce_rc_config_has_group (const XfceRc *rc,
+ const gchar *name) G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_config_set_group (XfceRc *rc,
+ const gchar *name);
+G_GNUC_INTERNAL void _xfce_rc_config_delete_entry(XfceRc *rc,
const gchar *key,
- gboolean global)
G_GNUC_INTERNAL;
-gboolean _xfce_rc_config_has_entry (const XfceRc *rc,
- const gchar *key) G_GNUC_CONST
G_GNUC_INTERNAL;
-const gchar* _xfce_rc_config_read_entry (const XfceRc *rc,
+ gboolean global);
+G_GNUC_INTERNAL gboolean _xfce_rc_config_has_entry (const XfceRc *rc,
+ const gchar *key) G_GNUC_CONST;
+G_GNUC_INTERNAL const gchar* _xfce_rc_config_read_entry (const XfceRc *rc,
const gchar *key,
- gboolean translated)
G_GNUC_CONST G_GNUC_INTERNAL;
-void _xfce_rc_config_write_entry (XfceRc *rc,
+ gboolean translated)
G_GNUC_CONST;
+G_GNUC_INTERNAL void _xfce_rc_config_write_entry (XfceRc *rc,
const gchar *key,
- const gchar *value)
G_GNUC_INTERNAL;
+ const gchar *value);
#endif /* !__LIBXFCE4UTIL_XFCE_RC_PRIVATE_H__ */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
