Module Name: xsrc
Committed By: mrg
Date: Sun Feb 5 23:26:20 UTC 2023
Modified Files:
xsrc/external/mit/libX11/dist/src: locking.h
Log Message:
avoid redefining xmalloc and xfree.
this file defines them with a parameter, but Xthreads.h (which comes from
xorgproto) only defines them as names, causing conflicting definitions.
fixes build with libX11 1.8.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/locking.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/locking.h
diff -u xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 xsrc/external/mit/libX11/dist/src/locking.h:1.2
--- xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 Tue Apr 27 06:10:57 2021
+++ xsrc/external/mit/libX11/dist/src/locking.h Sun Feb 5 23:26:20 2023
@@ -34,8 +34,12 @@ in this Software without prior written a
#ifndef _X_locking_H_
#define _X_locking_H_
+#ifndef xmalloc
#define xmalloc(s) Xmalloc(s)
+#endif
+#ifndef xfree
#define xfree(s) Xfree(s)
+#endif
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xthreads.h>
