Make Gtk compile: Fix GTK_NOTE definition for no debugging, and make gtk_use_mb defined whether or not debugging is enabled

glib/gmem.c

@@ -20,8 +20,8 @@
 #include "glib.h"
 
 
-/* #define MEM_PROFILE */
-/* #define MEM_CHECK */
+#define MEM_PROFILE
+#define MEM_CHECK
 
 
 #define MAX_MEM_AREA  65536L

gtk/gtkdebug.h

@@ -35,7 +35,7 @@ typedef enum {
 
 #else /* !G_ENABLE_DEBUG */
 
-#define GTK_NOTE
+#define GTK_NOTE(type, action)
       
 #endif /* G_ENABLE_DEBUG */
 

gtk/gtkmain.c

@@ -35,6 +35,7 @@
 #include "gtkprivate.h"
 #include "gdk/gdki18n.h"
 #include "../config.h"
+#include "gtkdebug.h"
 
 
 /* Private type definitions
@@ -174,12 +175,9 @@ static GDebugKey gtk_debug_keys[] = {
 
 static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
 
-gboolean gtk_use_mb = -1;
-
 #endif /* G_ENABLE_DEBUG */
 
-
-
+gint gtk_use_mb = -1;
 
 void
 gtk_init (int	 *argc,
@@ -281,7 +279,7 @@ gtk_init (int	 *argc,
 
   setlocale (LC_CTYPE, current_locale);
 
-  GTK_NOTE (MISC, g_print("%s multi-byte string functions.\n", 
+  GTK_NOTE(MISC, g_print("%s multi-byte string functions.\n", 
 			  gtk_use_mb ? "Using" : "Not using"));
 
   /* Initialize the default visual and colormap to be

gtk/gtkprivate.h

@@ -64,7 +64,7 @@ enum
  * correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the
  * C locale, or were using X's mb functions. (-DX_LOCALE && locale != C)
  */
-extern gboolean gtk_use_mb;
+extern gint gtk_use_mb;
 
 #ifdef __cplusplus
 }