diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2020-08-16 14:54:47 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2020-08-28 20:29:27 +0000 |
| commit | 52b0cd67073f2f4665884b5a7decfedeb3b7ca1e (patch) | |
| tree | 196c586cc5b10fcf846d441e64f4137878a1e872 /include | |
| parent | deafb99fd8faf8b044eaee13d072440ce4db76af (diff) | |
Raise minimum required xproto version to 7.0.25 (released 2013-11-23)
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/Xlibint.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h index f2864745..3303813e 100644 --- a/include/X11/Xlibint.h +++ b/include/X11/Xlibint.h @@ -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 |