From a746c7c098086a05aa2df743451cd2fa1ad61b42 Mon Sep 17 00:00:00 2001 From: jacob berkman Date: Fri, 4 Oct 2002 17:07:04 +0000 Subject: [PATCH] make legal C 2002-10-04 jacob berkman * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gdk/x11/gdkscreen-x11.c | 7 ++++--- 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c0aeadd5a..5cf3868db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2002-10-04 jacob berkman + + * gdk/x11/gdkscreen-x11.c (init_xinerama_support): make legal C + Fri Oct 4 12:05:27 2002 Owen Taylor * demos/Makefile.am (pixbuf_csource): Fix envars diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index ceaa31463..0cf0529c1 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -482,13 +482,14 @@ static void init_xinerama_support (GdkScreen * screen) { GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); +#ifdef HAVE_XINERAMA + int opcode, firstevent, firsterror; +#endif if (screen_x11->monitors) g_free (screen_x11->monitors); -#ifdef HAVE_XINERAMA - int opcode, firstevent, firsterror; - +#ifdef HAVE_XINERAMA if (XQueryExtension (GDK_SCREEN_XDISPLAY (screen), "XINERAMA", &opcode, &firstevent, &firsterror)) {