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.
2024-12-25 06:56:14 +01:00 · 2001-11-22 18:55:06 +00:00 · 2001-11-22 18:55:06 +00:00 · e767aa0a4f
commit e767aa0a4f
parent b9f59f0f9d
16 changed files with 54 additions and 44 deletions
--- 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()
--- 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
--- 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
--- 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
--- 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>
--- 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,
--- 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>
--- 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>
--- 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.
 *
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>


--- 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