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 7d1ff78..11dc544 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 af26562..1645502 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 aa60540..6dd67c6 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 ea2c4be..edb21ab 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 cc5f3d7..ae70fbb 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 97ec620..7957854 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 0a3bdf1..6d354b7 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 39cf580..a08a01d 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 ff8e12d..ac6724f 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 d017b72..6735d13 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 d8aac37..3f6599c 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 4871f81..548283d 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 26f4952..463f3a1 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 685bf3f..3c4f232 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 456962e..863d2c3 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 0423d5e..4649bc8 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