diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
| commit | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (patch) | |
| tree | 063ea788b90cc200b84b40ce431a7649045de907 /libXinerama | |
| parent | 697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (diff) | |
| download | vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.gz vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.bz2 vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.zip | |
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
xserver commit 80481267662c8687e73081237913fa561e7a6561
libX11 commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4
libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909
mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b
libXmu commit e02c30fac32e4873240e507cadc416f710188feb
mesa commit 72cae2a599881e926b8709f4dfa2cc3591ea7a02
Diffstat (limited to 'libXinerama')
| -rw-r--r-- | libXinerama/configure.ac | 8 | ||||
| -rw-r--r-- | libXinerama/src/Xinerama.c | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/libXinerama/configure.ac b/libXinerama/configure.ac index 17c5cb1fd..e2b60dbc8 100644 --- a/libXinerama/configure.ac +++ b/libXinerama/configure.ac @@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1]) - -# Check for _XEatDataWords function that may be patched into older Xlib releases -SAVE_LIBS="$LIBS" -LIBS="$XINERAMA_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XINERAMA, [x11 >= 1.6] xext xextproto [xineramaproto >= 1.1.99.1]) # Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/libXinerama/src/Xinerama.c b/libXinerama/src/Xinerama.c index 67a35b578..8472ec5d0 100644 --- a/libXinerama/src/Xinerama.c +++ b/libXinerama/src/Xinerama.c @@ -35,20 +35,6 @@ Equipment Corporation. #include <X11/extensions/panoramiXproto.h> #include <X11/extensions/Xinerama.h> -#ifndef HAVE__XEATDATAWORDS -#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ -#include <limits.h> - -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif - static XExtensionInfo _panoramiX_ext_info_data; static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data; static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; |