glib r6713 - in trunk: . glib
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6713 - in trunk: . glib
- Date: Fri, 14 Mar 2008 19:30:40 +0000 (GMT)
Author: mitch
Date: Fri Mar 14 19:30:38 2008
New Revision: 6713
URL: http://svn.gnome.org/viewvc/glib?rev=6713&view=rev
Log:
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.
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/gdate.h
trunk/glib/gdir.h
trunk/glib/gerror.h
trunk/glib/gfileutils.h
trunk/glib/ghash.h
trunk/glib/ghook.h
trunk/glib/gi18n-lib.h
trunk/glib/gi18n.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/gprintf.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 Fri Mar 14 19:30:38 2008
@@ -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 @@
#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__ */
Modified: trunk/glib/garray.h
==============================================================================
--- trunk/glib/garray.h (original)
+++ trunk/glib/garray.h Fri Mar 14 19:30:38 2008
@@ -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 @@
GCompareDataFunc compare_func,
gpointer user_data);
-
G_END_DECLS
#endif /* __G_ARRAY_H__ */
-
Modified: trunk/glib/gasyncqueue.h
==============================================================================
--- trunk/glib/gasyncqueue.h (original)
+++ trunk/glib/gasyncqueue.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_ASYNCQUEUE_H__ */
-
Modified: trunk/glib/gatomic.h
==============================================================================
--- trunk/glib/gatomic.h (original)
+++ trunk/glib/gatomic.h Fri Mar 14 19:30:38 2008
@@ -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 @@
(g_atomic_int_exchange_and_add ((atomic), -1) == 1)
G_END_DECLS
-
+
#endif /* __G_ATOMIC_H__ */
Modified: trunk/glib/gbacktrace.h
==============================================================================
--- trunk/glib/gbacktrace.h (original)
+++ trunk/glib/gbacktrace.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gbase64.h
==============================================================================
--- trunk/glib/gbase64.h (original)
+++ trunk/glib/gbase64.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gbookmarkfile.h
==============================================================================
--- trunk/glib/gbookmarkfile.h (original)
+++ trunk/glib/gbookmarkfile.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gcache.h
==============================================================================
--- trunk/glib/gcache.h (original)
+++ trunk/glib/gcache.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_CACHE_H__ */
-
-
-
Modified: trunk/glib/gchecksum.h
==============================================================================
--- trunk/glib/gchecksum.h (original)
+++ trunk/glib/gchecksum.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gcompletion.h
==============================================================================
--- trunk/glib/gcompletion.h (original)
+++ trunk/glib/gcompletion.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_COMPLETION_H__ */
-
Modified: trunk/glib/gconvert.h
==============================================================================
--- trunk/glib/gconvert.h (original)
+++ trunk/glib/gconvert.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gdataset.h
==============================================================================
--- trunk/glib/gdataset.h (original)
+++ trunk/glib/gdataset.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_DATASET_H__ */
-
-
-
-
Modified: trunk/glib/gdate.h
==============================================================================
--- trunk/glib/gdate.h (original)
+++ trunk/glib/gdate.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_DATE_H__ */
-
Modified: trunk/glib/gdir.h
==============================================================================
--- trunk/glib/gdir.h (original)
+++ trunk/glib/gdir.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gerror.h
==============================================================================
--- trunk/glib/gerror.h (original)
+++ trunk/glib/gerror.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_ERROR_H__ */
-
Modified: trunk/glib/gfileutils.h
==============================================================================
--- trunk/glib/gfileutils.h (original)
+++ trunk/glib/gfileutils.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/ghash.h
==============================================================================
--- trunk/glib/ghash.h (original)
+++ trunk/glib/ghash.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_HASH_H__ */
-
Modified: trunk/glib/ghook.h
==============================================================================
--- trunk/glib/ghook.h (original)
+++ trunk/glib/ghook.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_HOOK_H__ */
-
Modified: trunk/glib/gi18n-lib.h
==============================================================================
--- trunk/glib/gi18n-lib.h (original)
+++ trunk/glib/gi18n-lib.h Fri Mar 14 19:30:38 2008
@@ -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__ */
Modified: trunk/glib/gi18n.h
==============================================================================
--- trunk/glib/gi18n.h (original)
+++ trunk/glib/gi18n.h Fri Mar 14 19:30:38 2008
@@ -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__ */
-
-
Modified: trunk/glib/giochannel.h
==============================================================================
--- trunk/glib/giochannel.h (original)
+++ trunk/glib/giochannel.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gkeyfile.h
==============================================================================
--- trunk/glib/gkeyfile.h (original)
+++ trunk/glib/gkeyfile.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/glib.h
==============================================================================
--- trunk/glib/glib.h (original)
+++ trunk/glib/glib.h Fri Mar 14 19:30:38 2008
@@ -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>
Modified: trunk/glib/glist.h
==============================================================================
--- trunk/glib/glist.h (original)
+++ trunk/glib/glist.h Fri Mar 14 19:30:38 2008
@@ -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 @@
void g_list_push_allocator (gpointer allocator);
void g_list_pop_allocator (void);
#endif
+
G_END_DECLS
#endif /* __G_LIST_H__ */
-
Modified: trunk/glib/gmacros.h
==============================================================================
--- trunk/glib/gmacros.h (original)
+++ trunk/glib/gmacros.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gmain.h
==============================================================================
--- trunk/glib/gmain.h (original)
+++ trunk/glib/gmain.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gmappedfile.h
==============================================================================
--- trunk/glib/gmappedfile.h (original)
+++ trunk/glib/gmappedfile.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gmarkup.h
==============================================================================
--- trunk/glib/gmarkup.h (original)
+++ trunk/glib/gmarkup.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_MARKUP_H__ */
-
Modified: trunk/glib/gmem.h
==============================================================================
--- trunk/glib/gmem.h (original)
+++ trunk/glib/gmem.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gmessages.h
==============================================================================
--- trunk/glib/gmessages.h (original)
+++ trunk/glib/gmessages.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_MESSAGES_H__ */
-
Modified: trunk/glib/gnode.h
==============================================================================
--- trunk/glib/gnode.h (original)
+++ trunk/glib/gnode.h Fri Mar 14 19:30:38 2008
@@ -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 @@
void g_node_push_allocator (gpointer dummy);
void g_node_pop_allocator (void);
#endif
+
G_END_DECLS
#endif /* __G_NODE_H__ */
Modified: trunk/glib/goption.h
==============================================================================
--- trunk/glib/goption.h (original)
+++ trunk/glib/goption.h Fri Mar 14 19:30:38 2008
@@ -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_translation_domain (GOptionGroup *group,
const gchar *domain);
-
G_END_DECLS
#endif /* __G_OPTION_H__ */
Modified: trunk/glib/gpattern.h
==============================================================================
--- trunk/glib/gpattern.h (original)
+++ trunk/glib/gpattern.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gprimes.h
==============================================================================
--- trunk/glib/gprimes.h (original)
+++ trunk/glib/gprimes.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gprintf.h
==============================================================================
--- trunk/glib/gprintf.h (original)
+++ trunk/glib/gprintf.h Fri Mar 14 19:30:38 2008
@@ -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 @@
...) 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 @@
G_END_DECLS
#endif /* __G_PRINTF_H__ */
-
-
-
Modified: trunk/glib/gqsort.h
==============================================================================
--- trunk/glib/gqsort.h (original)
+++ trunk/glib/gqsort.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_QSORT_H__ */
-
Modified: trunk/glib/gquark.h
==============================================================================
--- trunk/glib/gquark.h (original)
+++ trunk/glib/gquark.h Fri Mar 14 19:30:38 2008
@@ -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_intern_string (const gchar *string);
G_CONST_RETURN gchar* g_intern_static_string (const gchar *string);
-
G_END_DECLS
#endif /* __G_QUARK_H__ */
-
Modified: trunk/glib/gqueue.h
==============================================================================
--- trunk/glib/gqueue.h (original)
+++ trunk/glib/gqueue.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/grand.h
==============================================================================
--- trunk/glib/grand.h (original)
+++ trunk/glib/grand.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_RAND_H__ */
-
-
-
-
-
-
Modified: trunk/glib/gregex.h
==============================================================================
--- trunk/glib/gregex.h (original)
+++ trunk/glib/gregex.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
-
#endif /* __G_REGEX_H__ */
Modified: trunk/glib/grel.h
==============================================================================
--- trunk/glib/grel.h (original)
+++ trunk/glib/grel.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_REL_H__ */
-
Modified: trunk/glib/gscanner.h
==============================================================================
--- trunk/glib/gscanner.h (original)
+++ trunk/glib/gscanner.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_SCANNER_H__ */
-
Modified: trunk/glib/gsequence.h
==============================================================================
--- trunk/glib/gsequence.h (original)
+++ trunk/glib/gsequence.h Fri Mar 14 19:30:38 2008
@@ -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 @@
GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter *begin,
GSequenceIter *end);
+G_END_DECLS
#endif /* __G_SEQUENCE_H__ */
Modified: trunk/glib/gshell.h
==============================================================================
--- trunk/glib/gshell.h (original)
+++ trunk/glib/gshell.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_SHELL_H__ */
-
-
Modified: trunk/glib/gslice.h
==============================================================================
--- trunk/glib/gslice.h (original)
+++ trunk/glib/gslice.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gslist.h
==============================================================================
--- trunk/glib/gslist.h (original)
+++ trunk/glib/gslist.h Fri Mar 14 19:30:38 2008
@@ -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 @@
void g_slist_push_allocator (gpointer dummy);
void g_slist_pop_allocator (void);
#endif
+
G_END_DECLS
#endif /* __G_SLIST_H__ */
-
Modified: trunk/glib/gspawn.h
==============================================================================
--- trunk/glib/gspawn.h (original)
+++ trunk/glib/gspawn.h Fri Mar 14 19:30:38 2008
@@ -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 @@
void g_spawn_close_pid (GPid pid);
-
G_END_DECLS
#endif /* __G_SPAWN_H__ */
-
-
Modified: trunk/glib/gstrfuncs.h
==============================================================================
--- trunk/glib/gstrfuncs.h (original)
+++ trunk/glib/gstrfuncs.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gstring.h
==============================================================================
--- trunk/glib/gstring.h (original)
+++ trunk/glib/gstring.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_STRING_H__ */
-
Modified: trunk/glib/gtestutils.h
==============================================================================
--- trunk/glib/gtestutils.h (original)
+++ trunk/glib/gtestutils.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gthread.h
==============================================================================
--- trunk/glib/gthread.h (original)
+++ trunk/glib/gthread.h Fri Mar 14 19:30:38 2008
@@ -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 @@
# define G_TRYLOCK(name) (TRUE)
#endif /* !G_THREADS_ENABLED */
-
G_END_DECLS
#endif /* __G_THREAD_H__ */
Modified: trunk/glib/gthreadpool.h
==============================================================================
--- trunk/glib/gthreadpool.h (original)
+++ trunk/glib/gthreadpool.h Fri Mar 14 19:30:38 2008
@@ -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 @@
G_END_DECLS
#endif /* __G_THREADPOOL_H__ */
-
Modified: trunk/glib/gtimer.h
==============================================================================
--- trunk/glib/gtimer.h (original)
+++ trunk/glib/gtimer.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gtree.h
==============================================================================
--- trunk/glib/gtree.h (original)
+++ trunk/glib/gtree.h Fri Mar 14 19:30:38 2008
@@ -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 @@
gint g_tree_height (GTree *tree);
gint g_tree_nnodes (GTree *tree);
-
-
G_END_DECLS
#endif /* __G_TREE_H__ */
-
Modified: trunk/glib/gtypes.h
==============================================================================
--- trunk/glib/gtypes.h (original)
+++ trunk/glib/gtypes.h Fri Mar 14 19:30:38 2008
@@ -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 @@
#endif /* GLIB_VAR */
#endif /* __G_TYPES_H__ */
-
Modified: trunk/glib/gunicode.h
==============================================================================
--- trunk/glib/gunicode.h (original)
+++ trunk/glib/gunicode.h Fri Mar 14 19:30:38 2008
@@ -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 @@
gchar *_g_utf8_make_valid (const gchar *name);
-
G_END_DECLS
#endif /* __G_UNICODE_H__ */
Modified: trunk/glib/gurifuncs.h
==============================================================================
--- trunk/glib/gurifuncs.h (original)
+++ trunk/glib/gurifuncs.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gutils.h
==============================================================================
--- trunk/glib/gutils.h (original)
+++ trunk/glib/gutils.h Fri Mar 14 19:30:38 2008
@@ -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__
Modified: trunk/glib/gwin32.h
==============================================================================
--- trunk/glib/gwin32.h (original)
+++ trunk/glib/gwin32.h Fri Mar 14 19:30:38 2008
@@ -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__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
