diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-24 13:31:13 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-24 13:31:13 +0000 |
| commit | 31666b7a30d9cccef0db66b04a513d957ceb5186 (patch) | |
| tree | 94144b77dd9bc1322d7fd9b7eb95f798de47e48a /lib/libXinerama/src | |
| parent | ebcde557c4efaafe990af7cf154cbbc151fa9141 (diff) | |
update to libXinerama 1.0.3
Diffstat (limited to 'lib/libXinerama/src')
| -rw-r--r-- | lib/libXinerama/src/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/libXinerama/src/Xinerama.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/libXinerama/src/Makefile.in b/lib/libXinerama/src/Makefile.in index 927b6d20c..d5caa091c 100644 --- a/lib/libXinerama/src/Makefile.in +++ b/lib/libXinerama/src/Makefile.in @@ -101,6 +101,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -134,6 +135,7 @@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -144,6 +146,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -155,7 +158,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_NMEDIT = @ac_ct_NMEDIT@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ diff --git a/lib/libXinerama/src/Xinerama.c b/lib/libXinerama/src/Xinerama.c index 43084b213..eff76333d 100644 --- a/lib/libXinerama/src/Xinerama.c +++ b/lib/libXinerama/src/Xinerama.c @@ -45,7 +45,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; #define PanoramiXSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, panoramiX_extension_name) -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); + static /* const */ XExtensionHooks panoramiX_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -266,8 +267,6 @@ Bool XineramaIsActive(Display *dpy) return rep.state; } -#include <stdio.h> - XineramaScreenInfo * XineramaQueryScreens( Display *dpy, @@ -279,7 +278,7 @@ XineramaQueryScreens( xXineramaQueryScreensReq *req; XineramaScreenInfo *scrnInfo = NULL; - PanoramiXCheckExtension (dpy, info, 0); + PanoramiXCheckExtension (dpy, info, NULL); LockDisplay (dpy); GetReq (XineramaQueryScreens, req); @@ -308,12 +307,11 @@ XineramaQueryScreens( *number = rep.number; } else _XEatData(dpy, rep.length << 2); + } else { + *number = 0; } UnlockDisplay (dpy); SyncHandle (); return scrnInfo; } - - - |