GNOME.org
 

glib r6875 - in trunk: . glib

Author: mitch
Date: Mon May  5 15:02:15 2008
New Revision: 6875
URL: http://svn.gnome.org/viewvc/glib?rev=6875&view=rev

Log:
2008-05-05  Michael Natterer  <mitch imendio com>

	* glib/glib.h: #define __GLIB_H_INSIDE__ around including
	everything.

	* glib/*.h: check for that define instead of __G_LIB_H__ if
	G_DISABLE_SINGLE_INCLUDES is defined.

	* glib/gdatasetprivate.h: #include <glib.h> instead of
	<glib/gdataset.h>



Modified:
   trunk/ChangeLog
   trunk/glib/galloca.h
   trunk/glib/garray.h
   trunk/glib/gasyncqueue.h
   trunk/glib/gatomic.h
   trunk/glib/gbacktrace.h
   trunk/glib/gbase64.h
   trunk/glib/gbookmarkfile.h
   trunk/glib/gcache.h
   trunk/glib/gchecksum.h
   trunk/glib/gcompletion.h
   trunk/glib/gconvert.h
   trunk/glib/gdataset.h
   trunk/glib/gdatasetprivate.h
   trunk/glib/gdate.h
   trunk/glib/gdir.h
   trunk/glib/gerror.h
   trunk/glib/gfileutils.h
   trunk/glib/ghash.h
   trunk/glib/ghook.h
   trunk/glib/giochannel.h
   trunk/glib/gkeyfile.h
   trunk/glib/glib.h
   trunk/glib/glist.h
   trunk/glib/gmacros.h
   trunk/glib/gmain.h
   trunk/glib/gmappedfile.h
   trunk/glib/gmarkup.h
   trunk/glib/gmem.h
   trunk/glib/gmessages.h
   trunk/glib/gnode.h
   trunk/glib/goption.h
   trunk/glib/gpattern.h
   trunk/glib/gprimes.h
   trunk/glib/gqsort.h
   trunk/glib/gquark.h
   trunk/glib/gqueue.h
   trunk/glib/grand.h
   trunk/glib/gregex.h
   trunk/glib/grel.h
   trunk/glib/gscanner.h
   trunk/glib/gsequence.h
   trunk/glib/gshell.h
   trunk/glib/gslice.h
   trunk/glib/gslist.h
   trunk/glib/gspawn.h
   trunk/glib/gstrfuncs.h
   trunk/glib/gstring.h
   trunk/glib/gtestutils.h
   trunk/glib/gthread.h
   trunk/glib/gthreadpool.h
   trunk/glib/gtimer.h
   trunk/glib/gtree.h
   trunk/glib/gtypes.h
   trunk/glib/gunicode.h
   trunk/glib/gurifuncs.h
   trunk/glib/gutils.h
   trunk/glib/gwin32.h

Modified: trunk/glib/galloca.h
==============================================================================
--- trunk/glib/galloca.h	(original)
+++ trunk/glib/galloca.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/garray.h
==============================================================================
--- trunk/glib/garray.h	(original)
+++ trunk/glib/garray.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gasyncqueue.h
==============================================================================
--- trunk/glib/gasyncqueue.h	(original)
+++ trunk/glib/gasyncqueue.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gatomic.h
==============================================================================
--- trunk/glib/gatomic.h	(original)
+++ trunk/glib/gatomic.h	Mon May  5 15:02:15 2008
@@ -27,7 +27,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gbacktrace.h
==============================================================================
--- trunk/glib/gbacktrace.h	(original)
+++ trunk/glib/gbacktrace.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gbase64.h
==============================================================================
--- trunk/glib/gbase64.h	(original)
+++ trunk/glib/gbase64.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gbookmarkfile.h
==============================================================================
--- trunk/glib/gbookmarkfile.h	(original)
+++ trunk/glib/gbookmarkfile.h	Mon May  5 15:02:15 2008
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gcache.h
==============================================================================
--- trunk/glib/gcache.h	(original)
+++ trunk/glib/gcache.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gchecksum.h
==============================================================================
--- trunk/glib/gchecksum.h	(original)
+++ trunk/glib/gchecksum.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gcompletion.h
==============================================================================
--- trunk/glib/gcompletion.h	(original)
+++ trunk/glib/gcompletion.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gconvert.h
==============================================================================
--- trunk/glib/gconvert.h	(original)
+++ trunk/glib/gconvert.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gdataset.h
==============================================================================
--- trunk/glib/gdataset.h	(original)
+++ trunk/glib/gdataset.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gdatasetprivate.h
==============================================================================
--- trunk/glib/gdatasetprivate.h	(original)
+++ trunk/glib/gdatasetprivate.h	Mon May  5 15:02:15 2008
@@ -28,7 +28,7 @@
 #ifndef __G_DATASETPRIVATE_H__
 #define __G_DATASETPRIVATE_H__
 
-#include <glib/gdataset.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/glib/gdate.h
==============================================================================
--- trunk/glib/gdate.h	(original)
+++ trunk/glib/gdate.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gdir.h
==============================================================================
--- trunk/glib/gdir.h	(original)
+++ trunk/glib/gdir.h	Mon May  5 15:02:15 2008
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gerror.h
==============================================================================
--- trunk/glib/gerror.h	(original)
+++ trunk/glib/gerror.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gfileutils.h
==============================================================================
--- trunk/glib/gfileutils.h	(original)
+++ trunk/glib/gfileutils.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/ghash.h
==============================================================================
--- trunk/glib/ghash.h	(original)
+++ trunk/glib/ghash.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/ghook.h
==============================================================================
--- trunk/glib/ghook.h	(original)
+++ trunk/glib/ghook.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/giochannel.h
==============================================================================
--- trunk/glib/giochannel.h	(original)
+++ trunk/glib/giochannel.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gkeyfile.h
==============================================================================
--- trunk/glib/gkeyfile.h	(original)
+++ trunk/glib/gkeyfile.h	Mon May  5 15:02:15 2008
@@ -20,7 +20,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/glib.h
==============================================================================
--- trunk/glib/glib.h	(original)
+++ trunk/glib/glib.h	Mon May  5 15:02:15 2008
@@ -27,6 +27,8 @@
 #ifndef __G_LIB_H__
 #define __G_LIB_H__
 
+#define __GLIB_H_INSIDE__
+
 #include <glib/galloca.h>
 #include <glib/garray.h>
 #include <glib/gasyncqueue.h>
@@ -85,4 +87,6 @@
 #include <glib/gwin32.h>
 #endif
 
+#undef __GLIB_H_INSIDE__
+
 #endif /* __G_LIB_H__ */

Modified: trunk/glib/glist.h
==============================================================================
--- trunk/glib/glist.h	(original)
+++ trunk/glib/glist.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmacros.h
==============================================================================
--- trunk/glib/gmacros.h	(original)
+++ trunk/glib/gmacros.h	Mon May  5 15:02:15 2008
@@ -28,7 +28,7 @@
  * not refer to variables from glibconfig.h
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmain.h
==============================================================================
--- trunk/glib/gmain.h	(original)
+++ trunk/glib/gmain.h	Mon May  5 15:02:15 2008
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmappedfile.h
==============================================================================
--- trunk/glib/gmappedfile.h	(original)
+++ trunk/glib/gmappedfile.h	Mon May  5 15:02:15 2008
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmarkup.h
==============================================================================
--- trunk/glib/gmarkup.h	(original)
+++ trunk/glib/gmarkup.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmem.h
==============================================================================
--- trunk/glib/gmem.h	(original)
+++ trunk/glib/gmem.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gmessages.h
==============================================================================
--- trunk/glib/gmessages.h	(original)
+++ trunk/glib/gmessages.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gnode.h
==============================================================================
--- trunk/glib/gnode.h	(original)
+++ trunk/glib/gnode.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/goption.h
==============================================================================
--- trunk/glib/goption.h	(original)
+++ trunk/glib/goption.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gpattern.h
==============================================================================
--- trunk/glib/gpattern.h	(original)
+++ trunk/glib/gpattern.h	Mon May  5 15:02:15 2008
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gprimes.h
==============================================================================
--- trunk/glib/gprimes.h	(original)
+++ trunk/glib/gprimes.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gqsort.h
==============================================================================
--- trunk/glib/gqsort.h	(original)
+++ trunk/glib/gqsort.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gquark.h
==============================================================================
--- trunk/glib/gquark.h	(original)
+++ trunk/glib/gquark.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gqueue.h
==============================================================================
--- trunk/glib/gqueue.h	(original)
+++ trunk/glib/gqueue.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/grand.h
==============================================================================
--- trunk/glib/grand.h	(original)
+++ trunk/glib/grand.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gregex.h
==============================================================================
--- trunk/glib/gregex.h	(original)
+++ trunk/glib/gregex.h	Mon May  5 15:02:15 2008
@@ -19,7 +19,7 @@
  * 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)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/grel.h
==============================================================================
--- trunk/glib/grel.h	(original)
+++ trunk/glib/grel.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gscanner.h
==============================================================================
--- trunk/glib/gscanner.h	(original)
+++ trunk/glib/gscanner.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gsequence.h
==============================================================================
--- trunk/glib/gsequence.h	(original)
+++ trunk/glib/gsequence.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gshell.h
==============================================================================
--- trunk/glib/gshell.h	(original)
+++ trunk/glib/gshell.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gslice.h
==============================================================================
--- trunk/glib/gslice.h	(original)
+++ trunk/glib/gslice.h	Mon May  5 15:02:15 2008
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gslist.h
==============================================================================
--- trunk/glib/gslist.h	(original)
+++ trunk/glib/gslist.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gspawn.h
==============================================================================
--- trunk/glib/gspawn.h	(original)
+++ trunk/glib/gspawn.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gstrfuncs.h
==============================================================================
--- trunk/glib/gstrfuncs.h	(original)
+++ trunk/glib/gstrfuncs.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gstring.h
==============================================================================
--- trunk/glib/gstring.h	(original)
+++ trunk/glib/gstring.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gtestutils.h
==============================================================================
--- trunk/glib/gtestutils.h	(original)
+++ trunk/glib/gtestutils.h	Mon May  5 15:02:15 2008
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gthread.h
==============================================================================
--- trunk/glib/gthread.h	(original)
+++ trunk/glib/gthread.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gthreadpool.h
==============================================================================
--- trunk/glib/gthreadpool.h	(original)
+++ trunk/glib/gthreadpool.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gtimer.h
==============================================================================
--- trunk/glib/gtimer.h	(original)
+++ trunk/glib/gtimer.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gtree.h
==============================================================================
--- trunk/glib/gtree.h	(original)
+++ trunk/glib/gtree.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gtypes.h
==============================================================================
--- trunk/glib/gtypes.h	(original)
+++ trunk/glib/gtypes.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gunicode.h
==============================================================================
--- trunk/glib/gunicode.h	(original)
+++ trunk/glib/gunicode.h	Mon May  5 15:02:15 2008
@@ -19,7 +19,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gurifuncs.h
==============================================================================
--- trunk/glib/gurifuncs.h	(original)
+++ trunk/glib/gurifuncs.h	Mon May  5 15:02:15 2008
@@ -20,7 +20,7 @@
  * Author: Alexander Larsson <alexl redhat com>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gutils.h
==============================================================================
--- trunk/glib/gutils.h	(original)
+++ trunk/glib/gutils.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 

Modified: trunk/glib/gwin32.h
==============================================================================
--- trunk/glib/gwin32.h	(original)
+++ trunk/glib/gwin32.h	Mon May  5 15:02:15 2008
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]