diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-19 10:32:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-19 10:32:31 +0000 |
| commit | b16c0295c9f95426980d567e93ae00c52545b3fa (patch) | |
| tree | d25e3271be998e47e0ff07048d8297001409ea5f /libX11/src/Xprivate.h | |
| parent | c1b8f2475ebdeb148f4a27b78ed3cb24c68a92c4 (diff) | |
| parent | 153f5cafa19da4e4c0cf21e9c909958359ed8ebd (diff) | |
| download | vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.gz vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.bz2 vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'libX11/src/Xprivate.h')
| -rw-r--r-- | libX11/src/Xprivate.h | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/libX11/src/Xprivate.h b/libX11/src/Xprivate.h index c2c7a0749..ce6e431ec 100644 --- a/libX11/src/Xprivate.h +++ b/libX11/src/Xprivate.h @@ -1,15 +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 int _XIDHandler(Display *dpy); -extern void _XSetPrivSyncFunction(Display *dpy); -extern void _XSetSeqSyncFunction(Display *dpy); - -#endif /* XPRIVATE_H */ +/* 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 */
|