fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-02-04 05:50:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Raise minimum required xproto version to 7.0.25 (released 2013-11-23)

Browse source 
Allows us to depend on _X_COLD directly instead of having to check for it.

(Since we also use _X_UNUSED, 7.0.22 or later was implicitly required
 already but not checked for.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2020-08-16 14:54:47 -07:00
parent deafb99fd8
commit 52b0cd6707
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -78,7 +78,7 @@ AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages
# Always required
X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1'
X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1'
X11_EXTRA_DEPS="xcb >= 1.11.1"
PKG_PROG_PKG_CONFIG()

13
include/X11/Xlibint.h
View file

@ -918,15 +918,6 @@ typedef struct _XExten { /* private to extension mechanism */
struct _XExten *next_flush; /* next in list of those with flushes */
} _XExtension;
/* Temporary definition until we can depend on an xproto release with it */
#ifdef _X_COLD
# define _XLIB_COLD _X_COLD
#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403) /* 4.3+ */
# define _XLIB_COLD __attribute__((__cold__))
#else
# define _XLIB_COLD /* nothing */
#endif
/* extension hooks */
#ifdef DataRoutineIsProcedure
@ -949,11 +940,11 @@ extern int (*_XErrorFunction)(
extern void _XEatData(
Display* /* dpy */,
unsigned long /* n */
) _XLIB_COLD;
) _X_COLD;
extern void _XEatDataWords(
Display* /* dpy */,
unsigned long /* n */
) _XLIB_COLD;
) _X_COLD;
#if defined(__SUNPRO_C) /* Studio compiler alternative to "cold" attribute */
# pragma rarely_called(_XEatData, _XEatDataWords)
#endif