5 files changed, 92 insertions, 2 deletions
diff --git a/libX11/src/xlibi18n/XDefaultOMIF.c b/libX11/src/xlibi18n/XDefaultOMIF.c
index 13f0d9cff..921ab2baf 100644
--- a/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -62,6 +62,10 @@ Sun Microsystems, Inc. or its licensors is granted.
 #define AllocLocalBuf(length)	(length > BUFSIZ ? (char *)Xmalloc(length) : local_buf)
 #define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
 
+#ifdef _MSC_VER
+typedef long ssize_t;
+#endif
+
 typedef struct _FontDataRec {
     char *name;
 } FontDataRec, *FontData;
diff --git a/libX11/src/xlibi18n/lcDB.c b/libX11/src/xlibi18n/lcDB.c
index 5228a0068..23da4f64e 100644
--- a/libX11/src/xlibi18n/lcDB.c
+++ b/libX11/src/xlibi18n/lcDB.c
@@ -64,6 +64,10 @@
 #define BUFSIZE 6144 /* 2048*3 */
 #endif
 
+#ifdef _MSC_VER
+typedef long ssize_t;
+#endif
+
 #include <stdio.h>
 
 typedef struct _DatabaseRec {
diff --git a/libX11/src/xlibi18n/lcDynamic.c b/libX11/src/xlibi18n/lcDynamic.c
index 5d359ed74..46ef41368 100644
--- a/libX11/src/xlibi18n/lcDynamic.c
+++ b/libX11/src/xlibi18n/lcDynamic.c
@@ -53,7 +53,7 @@ from The Open Group.
 #include "Xlcint.h"
 
 #ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
+#define XLOCALEDIR "locale"
 #endif
 
 #define LCLIBNAME    "xi18n.so"
diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c
index 65008fa37..add0a7b1b 100644
--- a/libX11/src/xlibi18n/lcFile.c
+++ b/libX11/src/xlibi18n/lcFile.c
@@ -34,7 +34,9 @@
 #include "Xlibint.h"
 #include "XlcPubI.h"
 #include <X11/Xos.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 /************************************************************************/
 
@@ -216,7 +218,7 @@ _XlcParsePath(
 }
 
 #ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
+#define XLOCALEDIR "locale"
 #endif
 
 static void
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile
new file mode 100644
index 000000000..5be81d350
--- /dev/null
+++ b/libX11/src/xlibi18n/makefile
@@ -0,0 +1,80 @@
+#AM_CFLAGS= \
+#	-I$(top_srcdir)/include \
+#	-I$(top_srcdir)/include/X11 \
+#	-I$(top_builddir)/include \
+#	-I$(top_builddir)/include/X11 \
+#	-I$(top_srcdir)/src/xcms \
+#	-I$(top_srcdir)/src/xkb \
+#	-I$(top_srcdir)/src/xlibi18n \
+#	-I$(top_srcdir)/src \
+#	$(X11_CFLAGS) \
+#	$(BIGFONT_CFLAGS) \
+#	$(XDMCP_CFLAGS) \
+#	-D_BSD_SOURCE \
+#	$(XMALLOC_ZERO_CFLAGS)
+
+LIBRARY = libi18n
+
+
+#
+# Dynamic loading code for i18n modules
+#
+#if XLIB_LOADABLE_I18N
+#XI18N_DL_SOURCES = \
+#                  XlcDL.c \
+#                  XlcSL.c
+#else
+#
+# Static interfaces to input/output methods
+#
+#IM_LIBS = \
+#	${top_builddir}/modules/im/ximcp/libximcp.la
+
+#LC_LIBS = \
+#	${top_builddir}/modules/lc/def/libxlcDef.la \
+#	${top_builddir}/modules/lc/gen/libxlibi18n.la \
+#	${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
+#	${top_builddir}/modules/lc/xlocale/libxlocale.la
+
+#OM_LIBS = \
+#	${top_builddir}/modules/om/generic/libxomGeneric.la
+#endif
+
+#libi18n_la_LIBADD = \
+#	 $(IM_LIBS) $(LC_LIBS) $(OM_LIBS)
+
+INCLUDES += ..\..\include\X11
+DEFINES += XLOCALELIBDIR="\".\""
+
+CSRCS = \
+	$(XI18N_DL_SOURCES) \
+	XDefaultIMIF.c \
+	XDefaultOMIF.c \
+	xim_trans.c\
+	ICWrap.c\
+	IMWrap.c\
+	imKStoUCS.c\
+	lcCT.c\
+	lcCharSet.c\
+	lcConv.c\
+	lcDB.c\
+	lcDynamic.c\
+	lcFile.c\
+	lcGeneric.c\
+	lcInit.c\
+	lcPrTxt.c\
+	lcPubWrap.c\
+	lcPublic.c\
+	lcRM.c\
+	lcStd.c\
+	lcTxtPr.c\
+	lcUTF8.c\
+	lcUtil.c\
+	lcWrap.c\
+	mbWMProps.c\
+	mbWrap.c\
+	utf8WMProps.c\
+	utf8Wrap.c\
+	wcWrap.c
+	
+