summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-08-16 21:15:11 +0000
committerTim Janik <timj@src.gnome.org>1998-08-16 21:15:11 +0000
commit31de6ff4e08c6bac186706f434089b30bc8c2770 (patch)
tree3e2c3feeeb3990dab9e147e62d4fc8f1f9e6e452 /gdk
parenta4a3c87b3d3514cf6712f51a3cf235904ca035e5 (diff)
downloadgdk-pixbuf-31de6ff4e08c6bac186706f434089b30bc8c2770.tar.gz
fatal warning option is split up now, "--g-fatal-warnings" causes fatal
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): fatal warning option is split up now, "--g-fatal-warnings" causes fatal warnings in GLib, "--gdk-fatal-warnings" causes fatal warnings in Gdk, "--gtk-fatal-warnings" causes fatal warnings in Gtk. * gtk/Makefile.am: define G_LOG_DOMAIN for gtk. * gdk/Makefile.am: define G_LOG_DOMAIN for gdk. * gtk/testgtk.c: * gdk/gxid.c: we need ugly #undef G_LOG_DOMAIN at the start of these files currently, since automake doesn't support per target _CFLAGS yet. * configure.in: require GLib 1.1.3.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/Makefile.am1
-rw-r--r--gdk/gxid.c1
-rw-r--r--gdk/x11/gxid.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 002e7c42b..90b85139b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -3,6 +3,7 @@
gdkincludedir = $(includedir)/gdk
lib_LTLIBRARIES = libgdk-1.1.la
+DEFS += -DG_LOG_DOMAIN=\"Gdk\"
libgdk_1_1_la_SOURCES = \
gdk.c \
diff --git a/gdk/gxid.c b/gdk/gxid.c
index 190eb0678..2b0994cbc 100644
--- a/gdk/gxid.c
+++ b/gdk/gxid.c
@@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
+#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>
diff --git a/gdk/x11/gxid.c b/gdk/x11/gxid.c
index 190eb0678..2b0994cbc 100644
--- a/gdk/x11/gxid.c
+++ b/gdk/x11/gxid.c
@@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
+#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>