diff options
Diffstat (limited to 'glib')
59 files changed, 283 insertions, 101 deletions
diff --git a/glib/galloca.h b/glib/galloca.h index baf80096a..34c75e61f 100644 --- a/glib/galloca.h +++ b/glib/galloca.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_ALLOCA_H__ #define __G_ALLOCA_H__ @@ -56,5 +60,4 @@ G_END_DECLS #define g_alloca(size) alloca (size) #define g_newa(struct_type, n_structs) ((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs))) - #endif /* __G_ALLOCA_H__ */ diff --git a/glib/garray.h b/glib/garray.h index 7858e3957..d9b8b0674 100644 --- a/glib/garray.h +++ b/glib/garray.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_ARRAY_H__ #define __G_ARRAY_H__ @@ -160,8 +164,6 @@ void g_byte_array_sort_with_data (GByteArray *array, GCompareDataFunc compare_func, gpointer user_data); - G_END_DECLS #endif /* __G_ARRAY_H__ */ - diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h index 7c860e85f..ef1b11490 100644 --- a/glib/gasyncqueue.h +++ b/glib/gasyncqueue.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_ASYNCQUEUE_H__ #define __G_ASYNCQUEUE_H__ @@ -114,4 +118,3 @@ GMutex* _g_async_queue_get_mutex (GAsyncQueue *queue); G_END_DECLS #endif /* __G_ASYNCQUEUE_H__ */ - diff --git a/glib/gatomic.h b/glib/gatomic.h index fefe2affc..58e55d2ff 100644 --- a/glib/gatomic.h +++ b/glib/gatomic.h @@ -19,21 +19,25 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - + /* * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with * GLib at ftp://ftp.gtk.org/pub/gtk/. */ - + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_ATOMIC_H__ #define __G_ATOMIC_H__ - + #include <glib/gtypes.h> G_BEGIN_DECLS - + gint g_atomic_int_exchange_and_add (volatile gint *atomic, gint val); void g_atomic_int_add (volatile gint *atomic, @@ -64,5 +68,5 @@ void g_atomic_pointer_set (volatile gpointer *atomic, (g_atomic_int_exchange_and_add ((atomic), -1) == 1) G_END_DECLS - + #endif /* __G_ATOMIC_H__ */ diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h index 836264ea5..8e7015dc3 100644 --- a/glib/gbacktrace.h +++ b/glib/gbacktrace.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_BACKTRACE_H__ #define __G_BACKTRACE_H__ diff --git a/glib/gbase64.h b/glib/gbase64.h index 6637984ec..8bf093c60 100644 --- a/glib/gbase64.h +++ b/glib/gbase64.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_BASE64_H__ #define __G_BASE64_H__ diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h index 2448e4a36..8dd4ec17c 100644 --- a/glib/gbookmarkfile.h +++ b/glib/gbookmarkfile.h @@ -17,6 +17,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_BOOKMARK_FILE_H__ #define __G_BOOKMARK_FILE_H__ diff --git a/glib/gcache.h b/glib/gcache.h index 93341b87f..3ee3aa398 100644 --- a/glib/gcache.h +++ b/glib/gcache.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_CACHE_H__ #define __G_CACHE_H__ @@ -63,6 +67,3 @@ void g_cache_value_foreach (GCache *cache, G_END_DECLS #endif /* __G_CACHE_H__ */ - - - diff --git a/glib/gchecksum.h b/glib/gchecksum.h index 8f7d8082b..39e6679d5 100644 --- a/glib/gchecksum.h +++ b/glib/gchecksum.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_CHECKSUM_H__ #define __G_CHECKSUM_H__ diff --git a/glib/gcompletion.h b/glib/gcompletion.h index 8adb23137..95d793819 100644 --- a/glib/gcompletion.h +++ b/glib/gcompletion.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_COMPLETION_H__ #define __G_COMPLETION_H__ @@ -71,4 +75,3 @@ void g_completion_free (GCompletion* cmp); G_END_DECLS #endif /* __G_COMPLETION_H__ */ - diff --git a/glib/gconvert.h b/glib/gconvert.h index 9e6ca6501..15edb3512 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_CONVERT_H__ #define __G_CONVERT_H__ diff --git a/glib/gdataset.h b/glib/gdataset.h index 0376cac97..3f4ee0a9e 100644 --- a/glib/gdataset.h +++ b/glib/gdataset.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_DATASET_H__ #define __G_DATASET_H__ @@ -116,7 +120,3 @@ void g_dataset_foreach (gconstpointer dataset_location, G_END_DECLS #endif /* __G_DATASET_H__ */ - - - - diff --git a/glib/gdate.h b/glib/gdate.h index 8ec02afc6..dcbf7fea9 100644 --- a/glib/gdate.h +++ b/glib/gdate.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_DATE_H__ #define __G_DATE_H__ @@ -257,4 +261,3 @@ gsize g_date_strftime (gchar *s, G_END_DECLS #endif /* __G_DATE_H__ */ - diff --git a/glib/gdir.h b/glib/gdir.h index 011174ebd..b668115ce 100644 --- a/glib/gdir.h +++ b/glib/gdir.h @@ -20,6 +20,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_DIR_H__ #define __G_DIR_H__ diff --git a/glib/gerror.h b/glib/gerror.h index 7fa8ef0fb..dc36fb303 100644 --- a/glib/gerror.h +++ b/glib/gerror.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_ERROR_H__ #define __G_ERROR_H__ @@ -81,4 +85,3 @@ void g_propagate_prefixed_error (GError **dest, G_END_DECLS #endif /* __G_ERROR_H__ */ - diff --git a/glib/gfileutils.h b/glib/gfileutils.h index 58f2d23ae..e6088e2a4 100644 --- a/glib/gfileutils.h +++ b/glib/gfileutils.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_FILEUTILS_H__ #define __G_FILEUTILS_H__ diff --git a/glib/ghash.h b/glib/ghash.h index 17ca7de61..a4b7dd861 100644 --- a/glib/ghash.h +++ b/glib/ghash.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_HASH_H__ #define __G_HASH_H__ @@ -139,4 +143,3 @@ gboolean g_direct_equal (gconstpointer v1, G_END_DECLS #endif /* __G_HASH_H__ */ - diff --git a/glib/ghook.h b/glib/ghook.h index cb4f8e1c2..dbcb29a37 100644 --- a/glib/ghook.h +++ b/glib/ghook.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_HOOK_H__ #define __G_HOOK_H__ @@ -175,4 +179,3 @@ void g_hook_list_marshal_check (GHookList *hook_list, G_END_DECLS #endif /* __G_HOOK_H__ */ - diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h index 9ba1f5165..0d6701756 100644 --- a/glib/gi18n-lib.h +++ b/glib/gi18n-lib.h @@ -16,10 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __G_I18N_LIB_H__ #define __G_I18N_LIB_H__ -#include <glib/gstrfuncs.h> +#include <glib.h> #include <libintl.h> @@ -32,5 +33,4 @@ #define N_(String) (String) #define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1) - #endif /* __G_I18N_LIB_H__ */ diff --git a/glib/gi18n.h b/glib/gi18n.h index a5c829b57..011b52f89 100644 --- a/glib/gi18n.h +++ b/glib/gi18n.h @@ -16,10 +16,12 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __G_I18N_H__ #define __G_I18N_H__ -#include <glib/gstrfuncs.h> +#include <glib.h> + #include <libintl.h> #define _(String) gettext (String) @@ -27,7 +29,4 @@ #define N_(String) (String) #define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1) - #endif /* __G_I18N_H__ */ - - diff --git a/glib/giochannel.h b/glib/giochannel.h index 846c9ba4a..9a5a5b116 100644 --- a/glib/giochannel.h +++ b/glib/giochannel.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_IOCHANNEL_H__ #define __G_IOCHANNEL_H__ diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index e7eadc68d..c874013a1 100644 --- a/glib/gkeyfile.h +++ b/glib/gkeyfile.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_KEY_FILE_H__ #define __G_KEY_FILE_H__ diff --git a/glib/glib.h b/glib/glib.h index 529c831ed..b2941da20 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -21,7 +21,7 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef __G_LIB_H__ @@ -67,6 +67,7 @@ #include <glib/gscanner.h> #include <glib/gsequence.h> #include <glib/gshell.h> +#include <glib/gslice.h> #include <glib/gslist.h> #include <glib/gspawn.h> #include <glib/gstrfuncs.h> diff --git a/glib/glist.h b/glib/glist.h index 258dcd1eb..4a5dd65c7 100644 --- a/glib/glist.h +++ b/glib/glist.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_LIST_H__ #define __G_LIST_H__ @@ -110,7 +114,7 @@ gpointer g_list_nth_data (GList *list, void g_list_push_allocator (gpointer allocator); void g_list_pop_allocator (void); #endif + G_END_DECLS #endif /* __G_LIST_H__ */ - diff --git a/glib/gmacros.h b/glib/gmacros.h index eb6b02c50..997e7b978 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -21,13 +21,17 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ /* This file must not include any other glib header file and must thus - * not refer to variables from glibconfig.h + * not refer to variables from glibconfig.h */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MACROS_H__ #define __G_MACROS_H__ diff --git a/glib/gmain.h b/glib/gmain.h index 67250da4b..6d400b291 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MAIN_H__ #define __G_MAIN_H__ diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h index 123bc6af2..ffc1a9423 100644 --- a/glib/gmappedfile.h +++ b/glib/gmappedfile.h @@ -18,6 +18,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MAPPED_FILE_H__ #define __G_MAPPED_FILE_H__ diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 340a21810..70b82c0f3 100644 --- a/glib/gmarkup.h +++ b/glib/gmarkup.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MARKUP_H__ #define __G_MARKUP_H__ @@ -152,4 +156,3 @@ gboolean g_markup_collect_attributes (const gchar *element_name, G_END_DECLS #endif /* __G_MARKUP_H__ */ - diff --git a/glib/gmem.h b/glib/gmem.h index 69a0befcf..5c83d9f78 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MEM_H__ #define __G_MEM_H__ diff --git a/glib/gmessages.h b/glib/gmessages.h index eb2ca8f9a..05fc37d2f 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_MESSAGES_H__ #define __G_MESSAGES_H__ @@ -335,4 +339,3 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); G_END_DECLS #endif /* __G_MESSAGES_H__ */ - diff --git a/glib/gnode.h b/glib/gnode.h index e5b7ebc89..9a15e0eab 100644 --- a/glib/gnode.h +++ b/glib/gnode.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_NODE_H__ #define __G_NODE_H__ @@ -278,6 +282,7 @@ GNode* g_node_last_sibling (GNode *node); void g_node_push_allocator (gpointer dummy); void g_node_pop_allocator (void); #endif + G_END_DECLS #endif /* __G_NODE_H__ */ diff --git a/glib/goption.h b/glib/goption.h index 908e53191..d678e97b0 100644 --- a/glib/goption.h +++ b/glib/goption.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_OPTION_H__ #define __G_OPTION_H__ @@ -154,7 +158,6 @@ void g_option_group_set_translate_func (GOptionGroup *group, void g_option_group_set_translation_domain (GOptionGroup *group, const gchar *domain); - G_END_DECLS #endif /* __G_OPTION_H__ */ diff --git a/glib/gpattern.h b/glib/gpattern.h index 5c8966877..cbbea9cd4 100644 --- a/glib/gpattern.h +++ b/glib/gpattern.h @@ -16,6 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_PATTERN_H__ #define __G_PATTERN_H__ diff --git a/glib/gprimes.h b/glib/gprimes.h index 0f1740cb1..46e9f9376 100644 --- a/glib/gprimes.h +++ b/glib/gprimes.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_PRIMES_H__ #define __G_PRIMES_H__ diff --git a/glib/gprintf.h b/glib/gprintf.h index aa542b3dc..d96870fb4 100644 --- a/glib/gprintf.h +++ b/glib/gprintf.h @@ -16,17 +16,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __G_PRINTF_H__ #define __G_PRINTF_H__ -#include <glib/gtypes.h> +#include <glib.h> #include <stdio.h> #include <stdarg.h> G_BEGIN_DECLS gint g_printf (gchar const *format, - ...) G_GNUC_PRINTF (1, 2); + ...) G_GNUC_PRINTF (1, 2); gint g_fprintf (FILE *file, gchar const *format, ...) G_GNUC_PRINTF (2, 3); @@ -35,7 +36,7 @@ gint g_sprintf (gchar *string, ...) G_GNUC_PRINTF (2, 3); gint g_vprintf (gchar const *format, - va_list args); + va_list args); gint g_vfprintf (FILE *file, gchar const *format, va_list args); @@ -49,6 +50,3 @@ gint g_vasprintf (gchar **string, G_END_DECLS #endif /* __G_PRINTF_H__ */ - - - diff --git a/glib/gqsort.h b/glib/gqsort.h index d0ff46a48..75987d732 100644 --- a/glib/gqsort.h +++ b/glib/gqsort.h @@ -21,9 +21,12 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif #ifndef __G_QSORT_H__ #define __G_QSORT_H__ @@ -41,4 +44,3 @@ void g_qsort_with_data (gconstpointer pbase, G_END_DECLS #endif /* __G_QSORT_H__ */ - diff --git a/glib/gquark.h b/glib/gquark.h index fc3006ff1..d061eba1b 100644 --- a/glib/gquark.h +++ b/glib/gquark.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_QUARK_H__ #define __G_QUARK_H__ @@ -43,8 +47,6 @@ G_CONST_RETURN gchar* g_quark_to_string (GQuark quark) G_GNUC_CON G_CONST_RETURN gchar* g_intern_string (const gchar *string); G_CONST_RETURN gchar* g_intern_static_string (const gchar *string); - G_END_DECLS #endif /* __G_QUARK_H__ */ - diff --git a/glib/gqueue.h b/glib/gqueue.h index c4004514d..afadfecdf 100644 --- a/glib/gqueue.h +++ b/glib/gqueue.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_QUEUE_H__ #define __G_QUEUE_H__ diff --git a/glib/grand.h b/glib/grand.h index cb6887bcf..fd2847ec6 100644 --- a/glib/grand.h +++ b/glib/grand.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_RAND_H__ #define __G_RAND_H__ @@ -79,9 +83,3 @@ gdouble g_random_double_range (gdouble begin, G_END_DECLS #endif /* __G_RAND_H__ */ - - - - - - diff --git a/glib/gregex.h b/glib/gregex.h index c60b447fd..82080bd07 100644 --- a/glib/gregex.h +++ b/glib/gregex.h @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_REGEX_H__ #define __G_REGEX_H__ @@ -236,5 +240,4 @@ gchar **g_match_info_fetch_all (const GMatchInfo *match_info); G_END_DECLS - #endif /* __G_REGEX_H__ */ diff --git a/glib/grel.h b/glib/grel.h index 275f05496..bec15e3a2 100644 --- a/glib/grel.h +++ b/glib/grel.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_REL_H__ #define __G_REL_H__ @@ -91,4 +95,3 @@ gpointer g_tuples_index (GTuples *tuples, G_END_DECLS #endif /* __G_REL_H__ */ - diff --git a/glib/gscanner.h b/glib/gscanner.h index a61c0a5b6..e85ac97d9 100644 --- a/glib/gscanner.h +++ b/glib/gscanner.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_SCANNER_H__ #define __G_SCANNER_H__ @@ -272,4 +276,3 @@ void g_scanner_warn (GScanner *scanner, G_END_DECLS #endif /* __G_SCANNER_H__ */ - diff --git a/glib/gsequence.h b/glib/gsequence.h index ffac6c62e..b301dcf48 100644 --- a/glib/gsequence.h +++ b/glib/gsequence.h @@ -18,11 +18,17 @@ * Boston, MA 02111-1307, USA. */ -#include <glib/gtypes.h> +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif #ifndef __G_SEQUENCE_H__ #define __G_SEQUENCE_H__ +#include <glib/gtypes.h> + +G_BEGIN_DECLS + typedef struct _GSequence GSequence; typedef struct _GSequenceNode GSequenceIter; @@ -117,5 +123,6 @@ gint g_sequence_iter_compare (GSequenceIter *a, GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter *begin, GSequenceIter *end); +G_END_DECLS #endif /* __G_SEQUENCE_H__ */ diff --git a/glib/gshell.h b/glib/gshell.h index b3f9d9148..680eae99e 100644 --- a/glib/gshell.h +++ b/glib/gshell.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_SHELL_H__ #define __G_SHELL_H__ @@ -49,5 +53,3 @@ gboolean g_shell_parse_argv (const gchar *command_line, G_END_DECLS #endif /* __G_SHELL_H__ */ - - diff --git a/glib/gslice.h b/glib/gslice.h index cd3b5aadb..56dc73fb8 100644 --- a/glib/gslice.h +++ b/glib/gslice.h @@ -16,6 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_SLICE_H__ #define __G_SLICE_H__ diff --git a/glib/gslist.h b/glib/gslist.h index 8ef540882..8619f8341 100644 --- a/glib/gslist.h +++ b/glib/gslist.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_SLIST_H__ #define __G_SLIST_H__ @@ -104,7 +108,7 @@ gpointer g_slist_nth_data (GSList *list, void g_slist_push_allocator (gpointer dummy); void g_slist_pop_allocator (void); #endif + G_END_DECLS #endif /* __G_SLIST_H__ */ - diff --git a/glib/gspawn.h b/glib/gspawn.h index adb674173..1cb578399 100644 --- a/glib/gspawn.h +++ b/glib/gspawn.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_SPAWN_H__ #define __G_SPAWN_H__ @@ -130,9 +134,6 @@ gboolean g_spawn_command_line_async (const gchar *command_line, void g_spawn_close_pid (GPid pid); - G_END_DECLS #endif /* __G_SPAWN_H__ */ - - diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h index bf35326f6..f94ccb3fd 100644 --- a/glib/gstrfuncs.h +++ b/glib/gstrfuncs.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_STRFUNCS_H__ #define __G_STRFUNCS_H__ diff --git a/glib/gstring.h b/glib/gstring.h index 427b56eef..6fc94b098 100644 --- a/glib/gstring.h +++ b/glib/gstring.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_STRING_H__ #define __G_STRING_H__ @@ -172,4 +176,3 @@ GString* g_string_up (GString *string); G_END_DECLS #endif /* __G_STRING_H__ */ - diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 7deb2a388..0e2ae79bc 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -17,6 +17,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_TEST_UTILS_H__ #define __G_TEST_UTILS_H__ diff --git a/glib/gthread.h b/glib/gthread.h index 515be1a54..6397b4843 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_THREAD_H__ #define __G_THREAD_H__ @@ -396,7 +400,6 @@ extern void glib_dummy_decl (void); # define G_TRYLOCK(name) (TRUE) #endif /* !G_THREADS_ENABLED */ - G_END_DECLS #endif /* __G_THREAD_H__ */ diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h index 91a02d6ae..8179f37f0 100644 --- a/glib/gthreadpool.h +++ b/glib/gthreadpool.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_THREADPOOL_H__ #define __G_THREADPOOL_H__ @@ -108,4 +112,3 @@ guint g_thread_pool_get_max_idle_time (void); G_END_DECLS #endif /* __G_THREADPOOL_H__ */ - diff --git a/glib/gtimer.h b/glib/gtimer.h index d602ae1b9..1f05c38ef 100644 --- a/glib/gtimer.h +++ b/glib/gtimer.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_TIMER_H__ #define __G_TIMER_H__ diff --git a/glib/gtree.h b/glib/gtree.h index bab712797..1d852ecbc 100644 --- a/glib/gtree.h +++ b/glib/gtree.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_TREE_H__ #define __G_TREE_H__ @@ -80,9 +84,6 @@ gpointer g_tree_search (GTree *tree, gint g_tree_height (GTree *tree); gint g_tree_nnodes (GTree *tree); - - G_END_DECLS #endif /* __G_TREE_H__ */ - diff --git a/glib/gtypes.h b/glib/gtypes.h index eaeabd2a8..9e7ea7600 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_TYPES_H__ #define __G_TYPES_H__ @@ -426,4 +430,3 @@ G_END_DECLS #endif /* GLIB_VAR */ #endif /* __G_TYPES_H__ */ - diff --git a/glib/gunicode.h b/glib/gunicode.h index 4c10fdb04..2fcb92073 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_UNICODE_H__ #define __G_UNICODE_H__ @@ -382,7 +386,6 @@ GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST; gchar *_g_utf8_make_valid (const gchar *name); - G_END_DECLS #endif /* __G_UNICODE_H__ */ diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h index 62f1dd287..78a1b914d 100644 --- a/glib/gurifuncs.h +++ b/glib/gurifuncs.h @@ -1,5 +1,5 @@ /* GIO - GLib Input, Output and Streaming Library - * + * * Copyright (C) 2006-2007 Red Hat, Inc. * * This library is free software; you can redistribute it and/or @@ -20,6 +20,10 @@ * Author: Alexander Larsson <alexl@redhat.com> */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_URI_FUNCS_H__ #define __G_URI_FUNCS_H__ diff --git a/glib/gutils.h b/glib/gutils.h index 4b72589a3..cc67ac410 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_UTILS_H__ #define __G_UTILS_H__ diff --git a/glib/gwin32.h b/glib/gwin32.h index 7b6aa1410..afef55be9 100644 --- a/glib/gwin32.h +++ b/glib/gwin32.h @@ -21,9 +21,13 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + #ifndef __G_WIN32_H__ #define __G_WIN32_H__ |