From 4394a972dc0868ad14fd0f7b35c692b22c282b41 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Sep 2010 13:04:07 -0400 Subject: [PATCH] Fix a logic error in the gdk_display deprecation --- gdk/x11/gdkx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 836889089e..6c53b60793 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS -#if !defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE) && defined (GDK_COMPILATION) +#if (!defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE)) || defined (GDK_COMPILATION) extern Display *gdk_display; #endif @@ -75,7 +75,7 @@ gint gdk_x11_get_default_screen (void); #define GDK_IMAGE_XDISPLAY(image) (gdk_x11_image_get_xdisplay (image)) #define GDK_IMAGE_XIMAGE(image) (gdk_x11_image_get_ximage (image)) -#if !defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE) && defined (GDK_COMPILATION) +#if (!defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE)) || defined (GDK_COMPILATION) #define GDK_DISPLAY() gdk_display #endif