more debugging fixes.

hey yosh, you beated me at gdk.c ;)
-timj

diff --git a/gdk/gdk.c b/gdk/gdk.c
index f4866a90440d5563bc4cea1d810fc9c916d72d17..af38b2fcc20c10527b79c918fc737f73bcd632f0 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -269,7 +269,7 @@ gdk_init (int    *argc,
 
 #ifdef G_ENABLE_DEBUG
   gboolean debug_set = FALSE;
-#endif
+#endif /* G_ENABLE_DEBUG */
 
   argv_orig = malloc ((argc_orig + 1) * sizeof (char*));
   for (i = 0; i < argc_orig; i++)
@@ -447,7 +447,7 @@ gdk_init (int    *argc,
                                                gdk_debug_keys,
                                sizeof(gdk_debug_keys) / sizeof(GDebugKey));
     }
-#endif
+#endif /* G_ENABLE_DEBUG */
 
   gdk_display = XOpenDisplay (gdk_display_name);
   if (!gdk_display)

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index c1abc26ecc8fc1c05427ed1982cfbef2588c4653..228e0eed89ea183617bcc52c444bcdd7c7a0e32a 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -231,7 +231,7 @@ extern gint              gdk_error_warnings;
 
 #define GDK_NOTE(type,action)                G_STMT_START { \
     if (gdk_debug_flags & GDK_DEBUG_##type)                 \
-       action;                               } G_STMT_END
+       { action; };                          } G_STMT_END
 
 #else /* !G_ENABLE_DEBUG */
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index f4866a90440d5563bc4cea1d810fc9c916d72d17..af38b2fcc20c10527b79c918fc737f73bcd632f0 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -269,7 +269,7 @@ gdk_init (int    *argc,
 
 #ifdef G_ENABLE_DEBUG
   gboolean debug_set = FALSE;
-#endif
+#endif /* G_ENABLE_DEBUG */
 
   argv_orig = malloc ((argc_orig + 1) * sizeof (char*));
   for (i = 0; i < argc_orig; i++)
@@ -447,7 +447,7 @@ gdk_init (int    *argc,
                                                gdk_debug_keys,
                                sizeof(gdk_debug_keys) / sizeof(GDebugKey));
     }
-#endif
+#endif /* G_ENABLE_DEBUG */
 
   gdk_display = XOpenDisplay (gdk_display_name);
   if (!gdk_display)

diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 1b149b3b6e87ca3c076cb966d06e4951b7d56188..3940f8f1f0ab3583eef4a2c1bafb60e6ac5bf3df 100644 (file)
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -30,7 +30,7 @@ typedef enum {
 
 #define GTK_NOTE(type,action)                G_STMT_START { \
     if (gtk_debug_flags & GTK_DEBUG_##type)                 \
-       action;                               } G_STMT_END
+       { action; };                          } G_STMT_END
 
 #else /* !G_ENABLE_DEBUG */
 

diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index cb7473beccd92a037d7f113be7851744d998733e..bf25c01988a0041c92aafa16bc06f60149e009a2 100644 (file)
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -246,8 +246,8 @@ void        gtk_object_setv         (GtkObject      *object,
 
 /* Allocate a GtkArg array of size nargs that hold the
  * names and types of the args that can be used with
- * gtk_object_set/gtk_object_get. if (*acess_masks!=NULL)
- * the pointer will be set to point to a newly allocated
+ * gtk_object_set/gtk_object_get. if (acess_masks!=NULL),
+ * (*access_mask) will be set to point to a newly allocated
  * guint array that holds the access masks of the args.
  * It is the callers response to do a
  * g_free (returned_args); g_free (*acess_masks).
@@ -300,7 +300,7 @@ void gtk_object_set_user_data (GtkObject *object,
                               gpointer   data);
 
 /* Get the "user_data" object data field of "object". It should
- *  be noted that this is no different than calling 'gtk_object_data_find'
+ *  be noted that this is no different than calling 'gtk_object_get_data'
  *  with a key of "user_data". It is merely provided as a convenience.
  */
 gpointer gtk_object_get_user_data (GtkObject *object);
@@ -320,7 +320,7 @@ void        gtk_trace_referencing   (gpointer    *object,
 #if G_ENABLE_DEBUG && defined (__GNUC__)
 #  define gtk_object_ref(o)   G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 1);f--;}G_STMT_END
 #  define gtk_object_unref(o) G_STMT_START{static guint f=0;gtk_trace_referencing((gpointer)o,__PRETTY_FUNCTION__,++f,__LINE__, 0);f--;}G_STMT_END
-#endif /* GTK_TRACE_OBJECTS && __GNUC__ */
+#endif /* G_ENABLE_DEBUG && __GNUC__ */