make it possible to disable single-file includes by defining

[platform/upstream/glib.git] / glib / gscanner.h

diff --git a/glib/gscanner.h b/glib/gscanner.h
index 2d2062b..e85ac97 100644 (file)
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -21,12 +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/.
  */
 
+#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__
 
+#include <glib/gdataset.h>
 #include <glib/ghash.h>
 
 G_BEGIN_DECLS
@@ -110,6 +115,7 @@ union       _GTokenValue
   gulong       v_binary;
   gulong       v_octal;
   gulong       v_int;
+  guint64       v_int64;
   gdouble      v_float;
   gulong       v_hex;
   gchar                *v_string;
@@ -154,6 +160,8 @@ struct      _GScannerConfig
   guint                char_2_token : 1;               /* return G_TOKEN_CHAR? */
   guint                symbol_2_token : 1;
   guint                scope_0_fallback : 1;           /* try scope 0 on lookups? */
+  guint                store_int64 : 1;                /* use value.v_int64 rather than v_int */
+  guint                padding_dummy;
 };
 
 struct _GScanner
@@ -268,4 +276,3 @@ void                g_scanner_warn                  (GScanner       *scanner,
 G_END_DECLS
 
 #endif /* __G_SCANNER_H__ */
-