[xsrc/trunk]: xsrc/external/mit/libX11/dist/src avoid redefining xmalloc and ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/eeaf009b9c88
branches:  trunk
changeset: 7411:eeaf009b9c88
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 05 23:26:20 2023 +0000

description:
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.

diffstat:

 external/mit/libX11/dist/src/locking.h |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r bb4c5eff0987 -r eeaf009b9c88 external/mit/libX11/dist/src/locking.h
--- a/external/mit/libX11/dist/src/locking.h    Sun Feb 05 22:58:20 2023 +0000
+++ b/external/mit/libX11/dist/src/locking.h    Sun Feb 05 23:26:20 2023 +0000
@@ -34,8 +34,12 @@
 #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>