Improve the detection of invalid includes by moving the test outside the

Mon Nov 19 14:35:56 2001  Owen Taylor  <otaylor@redhat.com>

        * *.h: Improve the detection of invalid includes by moving
        the test outside the duplicate include guards.

        * gsourceclosure.c (g_source_set_closure): Doc fix.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 7d1ff7895bdafb863c9036e7088be99eda840d5e..11dc5442d14207def5406b3cf2579dc75b430c20 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 19 14:35:56 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+       * *.h: Improve the detection of invalid includes by moving
+       the test outside the duplicate include guards.
+ 
+       * gsourceclosure.c (g_source_set_closure): Doc fix.
+
 Thu Nov 22 03:30:57 2001  Tim Janik  <timj@gtk.org>
 
        * gvalue.h (G_TYPE_IS_VALUE): use g_type_check_is_value_type()

diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index af26562b7e0b9c8b4a2140a5c4d9953fd1244af5..1645502f61e85869661c01fae3d12ed0809daa5a 100644 (file)
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_BOXED_H__
+#define __G_BOXED_H__
+
 #include        <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index aa605404d9df7e4623d757dc0ebb8c9d846074e3..6dd67c6c426a5ef01dc3e6c6552263c31f9f4b6e 100644 (file)
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_CLOSURE_H__
+#define __G_CLOSURE_H__
+
 #include        <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/genums.h b/gobject/genums.h
index ea2c4be8763c7bbd79e0ca63c1d78eeef19e3753..edb21ab5c2c6aac4588022b8b37d06bbb3b86f29 100644 (file)
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_ENUMS_H__
+#define __G_ENUMS_H__
+
 #include <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gobject.h b/gobject/gobject.h
index cc5f3d7e78f5f9600209a4b550d548608725707b..ae70fbb45d5612909d04b0bb13ff10ece739f067 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_OBJECT_H__
+#define __G_OBJECT_H__
+
 #include        <gobject/gtype.h>
 #include        <gobject/gvalue.h>
 #include        <gobject/gparam.h>

diff --git a/gobject/gparam.h b/gobject/gparam.h
index 97ec6207667243ea10205afaa6f10f271fe08bec..7957854810e4d57bbecff7646a0df98bad63c2de 100644 (file)
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -18,13 +18,13 @@
  *
  * gparam.h: GParamSpec base class implementation
  */
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_PARAM_H__
+#define __G_PARAM_H__
+
 #include       <gobject/gvalue.h>
 
 G_BEGIN_DECLS
@@ -166,6 +166,11 @@ struct _GParamSpecTypeInfo
 GType  g_param_type_register_static    (const gchar              *name,
                                         const GParamSpecTypeInfo *pspec_info);
 
+/* For registering builting types */
+GType  _g_param_type_register_static_constant (const gchar              *name,
+                                              const GParamSpecTypeInfo *pspec_info,
+                                              GType                     opt_type);
+
 
 /* --- protected --- */
 gpointer       g_param_spec_internal           (GType          param_type,

diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 0a3bdf19ffaff925ef89131ce41c07b6ed2cb123..6d354b7381bc061252d3ffae304883c9b90bb146 100644 (file)
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -18,13 +18,13 @@
  *
  * gparamspecs.h: GLib default param specs
  */
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_PARAMSPECS_H__
+#define __G_PARAMSPECS_H__
+
 #include        <gobject/gvalue.h>
 #include        <gobject/genums.h>
 #include        <gobject/gboxed.h>

diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index 39cf580b7471d1c85e46ffa3052e0073ae370a77..a08a01d645a45f8f1543b33b2e07dffbf08e9d6c 100644 (file)
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_SIGNAL_H__
+#define __G_SIGNAL_H__
+
 #include       <gobject/gclosure.h>
 #include       <gobject/gvalue.h>
 #include       <gobject/gparam.h>

diff --git a/gobject/gsourceclosure.c b/gobject/gsourceclosure.c
index ff8e12df8c520130e009f9ba5c0ed05f4cde343d..ac6724fe7e4246deea149631918977f12ea3434c 100644 (file)
--- a/gobject/gsourceclosure.c
+++ b/gobject/gsourceclosure.c
@@ -157,7 +157,7 @@ static GSourceCallbackFuncs closure_callback_funcs = {
 /**
  * g_source_set_closure:
  * @source: the source
- * @func: a #GClosure
+ * @closure: a #GClosure
  *
  * Set the callback for a source as a #GClosure.
  *

diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index d017b72f932c767027a6e66539bdbb42e2f6c9e7..6735d13ebadc7208389970c63904fdd1c853504d 100644 (file)
--- a/gobject/gsourceclosure.h
+++ b/gobject/gsourceclosure.h
@@ -16,13 +16,12 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __G_SOURCECLOSURE_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_SOURCECLOSURE_H__
+
 #include <gobject/gclosure.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtype.h b/gobject/gtype.h
index d8aac37a499b0795a7c2a7387aa279e621c657a7..3f6599c5393c98f721e272cf786d508779e4b7ec 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_TYPE_H__
+#define __G_TYPE_H__
+
 #include        <glib.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index 4871f81b4895332c9fe734397babfa08f299ab03..548283d41bd66a59d44c3ce349c0fc7038744f4a 100644 (file)
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -16,14 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_TYPE_MODULE_H__
+#define __G_TYPE_MODULE_H__
+
 #include <gobject/gobject.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index 26f4952195599561ebd26e354952df2a52173ff7..463f3a16eceb3f357d687048440a58090fe26ec4 100644 (file)
--- a/gobject/gtypeplugin.h
+++ b/gobject/gtypeplugin.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_TYPE_PLUGIN_H__
+#define __G_TYPE_PLUGIN_H__
+
 #include       <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index 685bf3f618a5c9dae1352cbb0ab5260eac5e8725..3c4f232953cc833db091f48397727851c1648817 100644 (file)
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -18,13 +18,13 @@
  *
  * gvalue.h: generic GValue functions
  */
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_VALUE_H__
+#define __G_VALUE_H__
+
 #include       <gobject/gtype.h>
 
 G_BEGIN_DECLS

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index 456962e3a6ca4a5b9b0fe5bbe5c3875e7a56afd9..863d2c30b9dd09031e16b3a4b58c3feac5324a20 100644 (file)
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -18,13 +18,13 @@
  *
  * gvaluearray.h: GLib array type holding GValues
  */
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_VALUE_ARRAY_H__
+#define __G_VALUE_ARRAY_H__
+
 #include       <gobject/gvalue.h>
 
 

diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 0423d5e05e31a9fd00a7223c744ed3c0a7454c97..4649bc8560a56939b5af21a4d1f14d2b7563ece1 100644 (file)
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -18,13 +18,13 @@
  *
  * gvaluetypes.h: GLib default values
  */
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __G_VALUETYPES_H__
+#define __G_VALUETYPES_H__
+
 #include       <gobject/gvalue.h>
 
 G_BEGIN_DECLS