diff options
author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /libX11 | |
parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'libX11')
-rw-r--r-- | libX11/src/makefile | 2 | ||||
-rw-r--r-- | libX11/src/xcms/config.h | 2 | ||||
-rw-r--r-- | libX11/src/xcms/makefile | 2 |
3 files changed, 5 insertions, 1 deletions
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 \ |