diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/Xprivate.h | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/Xprivate.h')
| -rw-r--r-- | nx-X11/lib/X11/Xprivate.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/Xprivate.h b/nx-X11/lib/X11/Xprivate.h new file mode 100644 index 000000000..ebe51c1ed --- /dev/null +++ b/nx-X11/lib/X11/Xprivate.h @@ -0,0 +1,28 @@ +/* Copyright (C) 2008 Jamey Sharp, Josh Triplett + * This file is licensed under the MIT license. See the file COPYING. + * + * As Xlibint.h has long become effectively public API, this header exists + * for new private functions that nothing outside of libX11 should call. + */ + +#ifndef XPRIVATE_H +#define XPRIVATE_H + +extern void _XIDHandler(Display *dpy); +extern void _XSeqSyncFunction(Display *dpy); +extern void _XSetPrivSyncFunction(Display *dpy); +extern void _XSetSeqSyncFunction(Display *dpy); + +#ifdef XTHREADS +#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) +#define InternalLockDisplay(d,wskip) if ((d)->lock) \ + (*(d)->lock->internal_lock_display)(d,wskip,__FILE__,__LINE__) +#else +#define InternalLockDisplay(d,wskip) if ((d)->lock) \ + (*(d)->lock->internal_lock_display)(d,wskip) +#endif +#else /* XTHREADS else */ +#define InternalLockDisplay(d,wskip) +#endif /* XTHREADS else */ + +#endif /* XPRIVATE_H */ |