make it possible to disable single-file includes by defining

2008-03-14  Michael Natterer  <mitch@imendio.com>

	* glib/*.h: make it possible to disable single-file includes by
	defining G_DISABLE_SINGLE_INCLUDES when building against GLib.
	Approved by Tim Janik.

	* glib/glib.h: include <glib/gslice.h>.

	* glib/gi18n.h
	* glib/gi18n-lib.h
	* glib/gprintf.h: include <glib.h> so the above works when these
	files are included without including <glib.h> first.

svn path=/trunk/; revision=6713

diff --git a/ChangeLog b/ChangeLog
index 76d5a6985774a103a719065546fa5899f64c236f..b8fa9331afdfebd7d260c757dd8199c49da802b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-03-14  Michael Natterer  <mitch@imendio.com>
+
+       * glib/*.h: make it possible to disable single-file includes by
+       defining G_DISABLE_SINGLE_INCLUDES when building against GLib.
+       Approved by Tim Janik.
+
+       * glib/glib.h: include <glib/gslice.h>.
+
+       * glib/gi18n.h
+       * glib/gi18n-lib.h
+       * glib/gprintf.h: include <glib.h> so the above works when these
+       files are included without including <glib.h> first.
+
 2008-03-14  Alexander Larsson  <alexl@redhat.com>
 
         * configure.in:

diff --git a/glib/galloca.h b/glib/galloca.h
index baf80096a764946a717d4e3715597d5df365e78c..34c75e61f28e78e74d48721800a7aca78b4c9875 100644 (file)
--- 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 7858e395769444bc6330c272dc302e9309ad9061..d9b8b0674374d9422d7f75522b5d875aa4ae4823 100644 (file)
--- 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 7c860e85f7131e0865b9afc10688719e52597a05..ef1b1149092557bd90da4d960f0f7ab68f6f18c9 100644 (file)
--- 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 fefe2affcf580a465d22d2c99ca568505fb2f8e9..58e55d2ff1359f534a705a8d4b0b6463e75cee5a 100644 (file)
--- 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 836264ea5a95ee71281c920e842bdcc8cdf5467e..8e7015dc3e2b16ffcf815d9ece5455d6f528afce 100644 (file)
--- 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 6637984ec16b96d8e656c6ed8b9c09ab05e0f485..8bf093c60bc42c2c3abe8af3b5d8df7498e3f198 100644 (file)
--- 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 2448e4a3611da49a649e8305f880d78582e77e8b..8dd4ec17cddac285f067ae5a07a595741295e5eb 100644 (file)
--- 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 93341b87fc94356a727f85c952211d8ec2d6b362..3ee3aa3980c7b5a1f17154b789f03990b5793cd5 100644 (file)
--- 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 8f7d8082b83e2c1d382d90eef461cdfe9e4989cc..39e6679d59b35442cd42919aa0a594a86cd39ac1 100644 (file)
--- 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 8adb231370c0c788d263e87a1f462d25b3f141b8..95d79381943d5b6703ae65ea75fcfce0ef53f01d 100644 (file)
--- 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 9e6ca6501864ee2438a660bf1a7e8e375bae3ff3..15edb3512e78ea68239424d69d40691578d75c24 100644 (file)
--- 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 0376cac979d5965f3d2d80a18b54188c78c8dd02..3f4ee0a9eb1a0185cb90ddf749cc43712a18dd30 100644 (file)
--- 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 8ec02afc6da85fc08ec65324a21b7957b4927500..dcbf7fea9e1223030bcea657ebd2957308df3c15 100644 (file)
--- 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 011174ebd7039ab08a3ce5f664a7b4a2181d1987..b668115ceef1ed9e3ebe44a510976774ea03f598 100644 (file)
--- 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 7fa8ef0fbe4b6f5f95c9ec532be35469a0b754ff..dc36fb30321bc64e94cc828371edbc4188311dd2 100644 (file)
--- 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 58f2d23aea86fb9c85a0ac3911708ce28f55e58f..e6088e2a458db60bfe6a5954de9bb3e4258ea8a2 100644 (file)
--- 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 17ca7de612afcfe95af8efbf00d5a875c560d9f8..a4b7dd8616680a91ad5ab11bc87d18f7bc13a169 100644 (file)
--- 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 cb4f8e1c20b2d5c4dfc38488b3690a656a55d5d0..dbcb29a37af8058020087e7c1257de84a7b4b619 100644 (file)
--- 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 9ba1f5165665fd8d36a0302c0972bc3575eaae96..0d6701756a1dcf6b9aabb4846e3edbf8827853c1 100644 (file)
--- 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 a5c829b57acb83f36e7291754d33a1ac73078284..011b52f89e4c7ebd3158d850a3410ac15c194ac5 100644 (file)
--- 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 846c9ba4ab76ad2fa247f960599b56a7b7abd728..9a5a5b116cb51c8584c1db95cde9aef2a6f17b2f 100644 (file)
--- 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 e7eadc68de2998872117d6f6f0065b98710e5115..c874013a1eadcce60fa538c0e8b92f217d531ef2 100644 (file)
--- 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 529c831ed8787d727adac65bafc13f892743cf59..b2941da2023d7450e51e4ab0a64b43ad68ad0025 100644 (file)
--- 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 258dcd1ebd5fb2ac11bfda2ef4ad950ca883f866..4a5dd65c7a19f70b1ba7be0679feb1507b7f0c1b 100644 (file)
--- 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 eb6b02c50935643cb7fe698c1a07c29809032fd6..997e7b9781398fcb1854f4deae894e2b85e317bb 100644 (file)
--- 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 67250da4bca8d561f3b033f6eea375d4df4a12e5..6d400b291234eff61a5c54ac5c6f5b88de0d7443 100644 (file)
--- 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 123bc6af202308c07723bab0b80656412421e900..ffc1a942324ebdcd6c1044c56b6a06c20fb6ad88 100644 (file)
--- 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 340a2181069862d976346215d7c1eaf4c2b60403..70b82c0f31ef97a2b6c0b8b04f06d4b7aacafe40 100644 (file)
--- 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 69a0befcf78c258c9e52f6eccd28a91c109cb3cc..5c83d9f78e9337ce416fdb38a5142eb32b6e9f13 100644 (file)
--- 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 eb2ca8f9a6a7d102909dca305604989ea6751893..05fc37d2fa016e2df13171b7e6b3b65423a595de 100644 (file)
--- 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 e5b7ebc89a1861076bf38eef18b921ee33385935..9a15e0eab51cd36f78fc786cb370cb5832e04a7b 100644 (file)
--- 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 908e53191990f455a55b8d04deefc5b69e644f94..d678e97b0213ce703bcf053e7c637602df8271a7 100644 (file)
--- 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 5c89668777153e549bef79085c0772e8faf63f0e..cbbea9cd4f598247a4aed4e2b03a0c390f4cd2bd 100644 (file)
--- 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 0f1740cb16fe93621759834ce2908abd198771c0..46e9f9376e3b2d3e9fc9db427389fa0bbbb3451b 100644 (file)
--- 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 aa542b3dcc2a0f603a2f10d2ab384fbc20e0740a..d96870fb441cdf523c3af1a4bf81868bdadc7ac5 100644 (file)
--- 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 d0ff46a484f9468302dc6e409a797e2292981ca8..75987d7322f382b7f2ddf18b8e54ad1b88b55bb0 100644 (file)
--- 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 fc3006ff17e7535146e3d48adecb3fba8f18485b..d061eba1bed79a5364c71718f8345fbdd6dde476 100644 (file)
--- 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 c4004514da36f7496d7eeb552966407dbde83c15..afadfecdffac039b3e3c084eeb03b74c7890d1a3 100644 (file)
--- 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 cb6887bcfcd253c6b32f3c574338413b1d06f2ef..fd2847ec637288551959105a5695308cb671cc27 100644 (file)
--- 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 c60b447fdfe2386da680f1672ab2ca345836f9c6..82080bd07f19164184649b9dec19446aedb64029 100644 (file)
--- 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 275f05496762a623d0396ead61e813d9129962e0..bec15e3a2283b2fad763b6cb99ac074df5d3afb6 100644 (file)
--- 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 a61c0a5b6dabb588d7baa153305f6490bc505cdf..e85ac97d9c3608b4ab614e4a4669a6a3d6f3cda6 100644 (file)
--- 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 ffac6c62e55a50f3dfc37d9266f640c3b21b8c1a..b301dcf4867513c0a5e669ba05810b81a9c2bd61 100644 (file)
--- 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 b3f9d91480702fd0db7bbea00fa875f23e9b286f..680eae99e96c98c3344d7514a45c253a064b897e 100644 (file)
--- 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 cd3b5aadbff2eb03f7111041a37577d42e763e00..56dc73fb800ac976f59cdd2ba91436245b7ee61d 100644 (file)
--- 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 8ef540882c3041a2809def0f9d93d7310a3ffb08..8619f8341e71ae6a44dd1e8defdd724194374203 100644 (file)
--- 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 adb674173d544c82ca55d39dd44d0f5fe630a0f1..1cb5783999b18a415bf3084434c8141d433ffbcb 100644 (file)
--- 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 bf35326f6ed665dde53f10da1f96a05fb5a19760..f94ccb3fda3550c60b3d56753d929b436dd4cf0d 100644 (file)
--- 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 427b56eefe4e5f6b8ff41c151647fa1fd54b6370..6fc94b098db0ec9dc40450bdcd6e4c489463a645 100644 (file)
--- 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 7deb2a388903dcf89f94542df7b3744c8b55bd1b..0e2ae79bc1c3bf4faa214ad3961dc4063f38ec84 100644 (file)
--- 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 515be1a548889bb57bd56ee493b0098b686897c9..6397b4843fd310a45482f89fc96fcca52739c206 100644 (file)
--- 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 91a02d6ae436ef28ebca5e57d9f39f6042a29ab1..8179f37f0da38312232b960d1a20b581dac7826f 100644 (file)
--- 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 d602ae1b96874d7087ae703bbdfea206c97e979f..1f05c38ef0b3d59c545b6daa97ad2b9f6e19844c 100644 (file)
--- 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 bab7127979daf6acfea252bd855162f14b2f9411..1d852ecbc311991a9574f20b4d3d867b6a38572f 100644 (file)
--- 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 eaeabd2a854931e0d8aae2013c610e78bf3c57c5..9e7ea760033e5308c64d625c8b63662822f225e9 100644 (file)
--- 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 4c10fdb04cb4186ec703e5cf3fc7ecdff03fbd33..2fcb9207361e0c25f989b8e044e671a51e54afcb 100644 (file)
--- 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 62f1dd287a2b00a165b873adfed3cc5173e3fbb4..78a1b914d4c58a296c8015bc3db9f39bc7ec4e51 100644 (file)
--- 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 4b72589a3ad70ebafe21f54d515c06b1d3b52d3e..cc67ac4102b06dae624c56c75e4cd4b6322f1e5b 100644 (file)
--- 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 7b6aa141017d3e6e19eba93d408a96f2c3111eab..afef55be95b9fd5db52252fcb68e1c1d7e2960ff 100644 (file)
--- 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__