From 7c20de6c7fb53ed404d4df0d975328318810ce01 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 18 Nov 2013 09:21:27 +0100 Subject: libXext mesa xkeyboard-config pixman 18 nov 2013 xkeyboard-config commit 51ab5c95e48b2a040fc132bb5c1a5e8bbe86c8f4 libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb pixman commit f473fd1e7553a4e92a0d72bea360f05d005c9a88 mesa commit 2cfbf84dadc915b7075a3f1cbb569daf699d5ff0 --- libXext/configure.ac | 8 +------- libXext/src/Makefile.am | 1 - libXext/src/XEVI.c | 1 - libXext/src/XMultibuf.c | 1 - libXext/src/XSecurity.c | 1 - libXext/src/XShape.c | 1 - libXext/src/XSync.c | 1 - libXext/src/Xcup.c | 1 - libXext/src/Xdbe.c | 1 - libXext/src/eat.h | 40 ---------------------------------------- 10 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 libXext/src/eat.h (limited to 'libXext') diff --git a/libXext/configure.ac b/libXext/configure.ac index 9a1e0c2c6..491aac086 100644 --- a/libXext/configure.ac +++ b/libXext/configure.ac @@ -36,13 +36,7 @@ fi AC_SUBST(XEXT_SOREV) # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.1.99]) - -# Check for _XEatDataWords function that may be patched into older Xlib releases -SAVE_LIBS="$LIBS" -LIBS="$XEXT_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.6] [xextproto >= 7.1.99]) # Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/libXext/src/Makefile.am b/libXext/src/Makefile.am index b8285470a..e236c3345 100644 --- a/libXext/src/Makefile.am +++ b/libXext/src/Makefile.am @@ -12,7 +12,6 @@ libXext_la_LDFLAGS = -version-number $(XEXT_SOREV) -no-undefined libXext_la_LIBADD = $(XEXT_LIBS) libXext_la_SOURCES = \ - eat.h \ DPMS.c \ MITMisc.c \ XAppgroup.c \ diff --git a/libXext/src/XEVI.c b/libXext/src/XEVI.c index 5a9558364..6d77fdf10 100644 --- a/libXext/src/XEVI.c +++ b/libXext/src/XEVI.c @@ -31,7 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "eat.h" static XExtensionInfo *xevi_info;/* needs to move to globals.c */ static const char *xevi_extension_name = EVINAME; diff --git a/libXext/src/XMultibuf.c b/libXext/src/XMultibuf.c index 43d56d3eb..75854aa68 100644 --- a/libXext/src/XMultibuf.c +++ b/libXext/src/XMultibuf.c @@ -34,7 +34,6 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "eat.h" static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; diff --git a/libXext/src/XSecurity.c b/libXext/src/XSecurity.c index ab17755c8..73305a381 100644 --- a/libXext/src/XSecurity.c +++ b/libXext/src/XSecurity.c @@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "eat.h" static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; diff --git a/libXext/src/XShape.c b/libXext/src/XShape.c index d02502004..15d754f44 100644 --- a/libXext/src/XShape.c +++ b/libXext/src/XShape.c @@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "eat.h" static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; diff --git a/libXext/src/XSync.c b/libXext/src/XSync.c index 6e2af79a5..3077db244 100644 --- a/libXext/src/XSync.c +++ b/libXext/src/XSync.c @@ -60,7 +60,6 @@ PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "eat.h" static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; diff --git a/libXext/src/Xcup.c b/libXext/src/Xcup.c index cdc64c2a3..fd6850ead 100644 --- a/libXext/src/Xcup.c +++ b/libXext/src/Xcup.c @@ -37,7 +37,6 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "eat.h" static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; diff --git a/libXext/src/Xdbe.c b/libXext/src/Xdbe.c index 7dd6c5ad2..13ec347e5 100644 --- a/libXext/src/Xdbe.c +++ b/libXext/src/Xdbe.c @@ -40,7 +40,6 @@ #include #include #include -#include "eat.h" static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; diff --git a/libXext/src/eat.h b/libXext/src/eat.h deleted file mode 100644 index 239532b6d..000000000 --- a/libXext/src/eat.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifndef HAVE__XEATDATAWORDS -#include /* for LONG64 on 64-bit platforms */ -#include - -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif -- cgit v1.2.3