Make single includes mandatory

This has been the official line since 2.17, which seems plenty
long enough for a transition phase.

diff --git a/README.in b/README.in
index 9c9a966..beeefed 100644 (file)
--- a/README.in
+++ b/README.in
@@ -36,6 +36,9 @@ Notes about GLib 2.32
   object is being used will not work with generic pointers (ie: (void*)
   and (gpointer) casts) which would have worked with the old version.
 
+* It is now mandatory to include glib.h instead of individual headers.
+
+
 Notes about GLib 2.30
 =====================
 

diff --git a/configure.ac b/configure.ac
index e4235e0..4a9e723 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -512,8 +512,6 @@ if test "x$GCC" = "xyes"; then
   esac
 fi
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
 if test "$glib_native_win32" = "yes"; then
   if test x$enable_static = xyes -a x$enable_shared = xyes; then
     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])

diff --git a/docs/reference/glib/compiling.sgml b/docs/reference/glib/compiling.sgml
index a473653..9d20a58 100644 (file)
--- a/docs/reference/glib/compiling.sgml
+++ b/docs/reference/glib/compiling.sgml
@@ -104,12 +104,8 @@ the <link linkend="glib-I18N">Internationalization section</link>),
 </para>
 
 <para>
-Starting with 2.17, GLib enforces this by generating an error
-when individual headers are directly included. To help with the
-transition, the enforcement is not turned on by default for GLib
-headers (it <emphasis>is</emphasis> turned on for GObject and GIO).
-To turn it on, define the preprocessor symbol G_DISABLE_SINGLE_INCLUDES
-by using the command line option <literal>-DG_DISABLE_SINGLE_INCLUDES</literal>.
+Starting with 2.32, GLib enforces this by generating an error
+when individual headers are directly included.
 </para>
 
 </refsect1>

diff --git a/glib/galloca.h b/glib/galloca.h
index 8876836..1ecdf65 100644 (file)
--- a/glib/galloca.h
+++ b/glib/galloca.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/garray.h b/glib/garray.h
index 8221806..3152b97 100644 (file)
--- a/glib/garray.h
+++ b/glib/garray.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
index 90d1854..5c362d2 100644 (file)
--- a/glib/gasyncqueue.h
+++ b/glib/gasyncqueue.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gatomic.h b/glib/gatomic.h
index 8b43bf0..0e4523f 100644 (file)
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -19,7 +19,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 0ee3efd..f599432 100644 (file)
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gbase64.h b/glib/gbase64.h
index 930389a..88ce6d8 100644 (file)
--- a/glib/gbase64.h
+++ b/glib/gbase64.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gbitlock.h b/glib/gbitlock.h
index ea9cb41..641ee69 100644 (file)
--- a/glib/gbitlock.h
+++ b/glib/gbitlock.h
@@ -25,7 +25,7 @@
 
 #include <glib/gtypes.h>
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h
index f663ebf..6b2ee6f 100644 (file)
--- a/glib/gbookmarkfile.h
+++ b/glib/gbookmarkfile.h
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gcache.h b/glib/gcache.h
index a7c8ffa..ab1a333 100644 (file)
--- a/glib/gcache.h
+++ b/glib/gcache.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gchecksum.h b/glib/gchecksum.h
index 59bb31c..69fe1f4 100644 (file)
--- a/glib/gchecksum.h
+++ b/glib/gchecksum.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gconvert.h b/glib/gconvert.h
index 2d1bc1f..7fd16c8 100644 (file)
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gdataset.h b/glib/gdataset.h
index 4451c38..eab296b 100644 (file)
--- a/glib/gdataset.h
+++ b/glib/gdataset.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gdate.h b/glib/gdate.h
index 5b92191..5ef1850 100644 (file)
--- a/glib/gdate.h
+++ b/glib/gdate.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gdatetime.h b/glib/gdatetime.h
index b76df89..6643e3f 100644 (file)
--- a/glib/gdatetime.h
+++ b/glib/gdatetime.h
@@ -23,7 +23,7 @@
  *          Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gdir.h b/glib/gdir.h
index 516fbb6..79b3038 100644 (file)
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gerror.h b/glib/gerror.h
index 871f310..6eb65fe 100644 (file)
--- a/glib/gerror.h
+++ b/glib/gerror.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index a3ff242..1773177 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/ghash.h b/glib/ghash.h
index c87c478..2e3184a 100644 (file)
--- a/glib/ghash.h
+++ b/glib/ghash.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/ghmac.h b/glib/ghmac.h
index 856abbf..e9b57de 100644 (file)
--- a/glib/ghmac.h
+++ b/glib/ghmac.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/ghook.h b/glib/ghook.h
index 5577fc3..e7292ea 100644 (file)
--- a/glib/ghook.h
+++ b/glib/ghook.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/giochannel.h b/glib/giochannel.h
index ed9e51c..1278714 100644 (file)
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
index e16dc61..6b38708 100644 (file)
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
@@ -20,7 +20,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/glist.h b/glib/glist.h
index 52eee10..aaa11f2 100644 (file)
--- a/glib/glist.h
+++ b/glib/glist.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmacros.h b/glib/gmacros.h
index ca14e72..2b340cb 100644 (file)
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -28,7 +28,7 @@
  * not refer to variables from glibconfig.h
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmain.h b/glib/gmain.h
index 13429a8..87ca4d6 100644 (file)
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h
index b7ca9d5..f697d8a 100644 (file)
--- a/glib/gmappedfile.h
+++ b/glib/gmappedfile.h
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index a69f6e2..a8865da 100644 (file)
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmem.h b/glib/gmem.h
index 5927f92..376e466 100644 (file)
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gmessages.h b/glib/gmessages.h
index c5220e3..8e174cc 100644 (file)
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gnode.h b/glib/gnode.h
index 6ad6e54..675b8b1 100644 (file)
--- a/glib/gnode.h
+++ b/glib/gnode.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/goption.h b/glib/goption.h
index 340a84c..7d1f2a1 100644 (file)
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gpattern.h b/glib/gpattern.h
index b653d71..e692d90 100644 (file)
--- a/glib/gpattern.h
+++ b/glib/gpattern.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gprimes.h b/glib/gprimes.h
index af57286..19f5702 100644 (file)
--- a/glib/gprimes.h
+++ b/glib/gprimes.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gqsort.h b/glib/gqsort.h
index 3a47a58..05b4b66 100644 (file)
--- a/glib/gqsort.h
+++ b/glib/gqsort.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gquark.h b/glib/gquark.h
index 324c956..78b9546 100644 (file)
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gqueue.h b/glib/gqueue.h
index 591a09a..dd236d5 100644 (file)
--- a/glib/gqueue.h
+++ b/glib/gqueue.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/grand.h b/glib/grand.h
index 0397992..182616b 100644 (file)
--- a/glib/grand.h
+++ b/glib/grand.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gregex.h b/glib/gregex.h
index bc5fff8..1110ad0 100644 (file)
--- a/glib/gregex.h
+++ b/glib/gregex.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gscanner.h b/glib/gscanner.h
index 3b7ad6f..2063db6 100644 (file)
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gsequence.h b/glib/gsequence.h
index 6a21c3e..3e5a03d 100644 (file)
--- a/glib/gsequence.h
+++ b/glib/gsequence.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gshell.h b/glib/gshell.h
index 130f100..ddb4ec5 100644 (file)
--- a/glib/gshell.h
+++ b/glib/gshell.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gslice.h b/glib/gslice.h
index 962199e..4b4b9e5 100644 (file)
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gslist.h b/glib/gslist.h
index 35a39a3..5652145 100644 (file)
--- a/glib/gslist.h
+++ b/glib/gslist.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gspawn.h b/glib/gspawn.h
index c9da1a8..84e0eeb 100644 (file)
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 134ddb7..62af3be 100644 (file)
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gstring.h b/glib/gstring.h
index 4e5e1ec..80d7b1e 100644 (file)
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h
index 9654885..5ab2e8a 100644 (file)
--- a/glib/gstringchunk.h
+++ b/glib/gstringchunk.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 1e49ad9..0184c7c 100644 (file)
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gthread.h b/glib/gthread.h
index ba7024d..072396f 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
index b11c10a..3a1f298 100644 (file)
--- a/glib/gthreadpool.h
+++ b/glib/gthreadpool.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gtimer.h b/glib/gtimer.h
index 743eed1..b927fc3 100644 (file)
--- a/glib/gtimer.h
+++ b/glib/gtimer.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gtimezone.h b/glib/gtimezone.h
index 58b0db9..c877e8f 100644 (file)
--- a/glib/gtimezone.h
+++ b/glib/gtimezone.h
@@ -19,7 +19,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gtree.h b/glib/gtree.h
index 0284c08..b4a6ce6 100644 (file)
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gtypes.h b/glib/gtypes.h
index 8e77563..db07201 100644 (file)
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 2216ebf..15b3a95 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -19,7 +19,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h
index bbc8f88..8097806 100644 (file)
--- a/glib/gurifuncs.h
+++ b/glib/gurifuncs.h
@@ -20,7 +20,7 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gutils.h b/glib/gutils.h
index fe5f270..f439934 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gvariant.h b/glib/gvariant.h
index 84fe95c..9abcc0b 100644 (file)
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index be9555e..99bbdad 100644 (file)
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

diff --git a/glib/gwin32.h b/glib/gwin32.h
index f368c1d..2d278d2 100644 (file)
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif