diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1998-03-17 19:55:33 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1998-03-17 19:55:33 +0000 |
| commit | df0b05ef2b80946feeb3487582a19bd455783a03 (patch) | |
| tree | 0d80dd4f95ba05f17efa39fa9c3599f52bf2e5f5 | |
| parent | 70b3b3e6e17331f34748528d71eeebec9101cde0 (diff) | |
| download | gtk+-df0b05ef2b80946feeb3487582a19bd455783a03.tar.gz | |
Make Gtk compile: Fix GTK_NOTE definition for no debugging, and make gtk_use_mb defined whether or not debugging is enabled
| -rw-r--r-- | glib/gmem.c | 4 | ||||
| -rw-r--r-- | gtk/gtkdebug.h | 2 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 8 | ||||
| -rw-r--r-- | gtk/gtkprivate.h | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/glib/gmem.c b/glib/gmem.c index 35dfdaba37..ec604aca6a 100644 --- a/glib/gmem.c +++ b/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 diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index a4b8cb6d34..9f56159f74 100644 --- a/gtk/gtkdebug.h +++ b/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 */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index ce9ff81118..1df42ad341 100644 --- a/gtk/gtkmain.c +++ b/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 diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 0c710ce2eb..2164f0998e 100644 --- a/gtk/gtkprivate.h +++ b/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 } |