From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 16 May 2010 20:50:58 +0000
Subject: svn merge -r588:HEAD ^/branches/released .

---
 libX11/src/makefile      | 2 +-
 libX11/src/xcms/config.h | 2 ++
 libX11/src/xcms/makefile | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 libX11/src/xcms/config.h

(limited to 'libX11')

diff --git a/libX11/src/makefile b/libX11/src/makefile
index 66cb7bba4..f928a38e2 100644
--- a/libX11/src/makefile
+++ b/libX11/src/makefile
@@ -263,7 +263,7 @@ CSRCS = \
                   xcb_disp.c \
                   xcb_io.c
 
-INCLUDES := xcms xlibi18n xkb $(MHMAKECONF)\X11 $(OBJDIR) $(INCLUDES)
+INCLUDES := . xcms xlibi18n xkb $(MHMAKECONF)\X11 $(OBJDIR) $(INCLUDES)
 
 KEYSYMDEF = $(MHMAKECONF)/X11/keysymdef.h
 
diff --git a/libX11/src/xcms/config.h b/libX11/src/xcms/config.h
new file mode 100644
index 000000000..7f15dd19f
--- /dev/null
+++ b/libX11/src/xcms/config.h
@@ -0,0 +1,2 @@
+#include <string.h>
+#define strdup _strdup
\ No newline at end of file
diff --git a/libX11/src/xcms/makefile b/libX11/src/xcms/makefile
index 181f1e84c..00fab124a 100644
--- a/libX11/src/xcms/makefile
+++ b/libX11/src/xcms/makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxcms
 
+DEFINES += HAVE_CONFIG_H
+
 CSRCS = \
 		  AddDIC.c \
                   AddSF.c \
-- 
cgit v1.2.3