Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013

Conflicts:
	libXinerama/src/Xinerama.c

6 files changed, 2 insertions, 148 deletions

diff --git a/libX11/src/SetLocale.c b/libX11/src/SetLocale.c
index 64166bda0..40ea3ac4d 100644
--- a/libX11/src/SetLocale.c
+++ b/libX11/src/SetLocale.c
@@ -67,58 +67,8 @@ from The Open Group.
 
 #define MAXLOCALE	64	/* buffer size of locale name */
 
-#ifdef X_LOCALE
 
-/* alternative setlocale() for when the OS does not provide one */
-
-char *
-_Xsetlocale(
-    int		  category,
-    _Xconst char  *name
-)
-{
-    static char *xsl_name;
-    char *old_name;
-    XrmMethods methods;
-    XPointer state;
-
-    if (category != LC_CTYPE && category != LC_ALL)
-	return NULL;
-    if (!name) {
-	if (xsl_name)
-	    return xsl_name;
-	return "C";
-    }
-    if (!*name)
-	name = getenv("LC_CTYPE");
-    if (!name || !*name)
-	name = getenv("LANG");
-    if (name && strlen(name) >= MAXLOCALE)
-	name = NULL;
-    if (!name || !*name || !_XOpenLC((char *) name))
-	name = "C";
-    old_name = xsl_name;
-    xsl_name = (char *)name;
-    methods = _XrmInitParseInfo(&state);
-    xsl_name = old_name;
-    if (!methods)
-	return NULL;
-    name = (*methods->lcname)(state);
-    xsl_name = strdup(name);
-    if (!xsl_name) {
-	xsl_name = old_name;
-	(*methods->destroy)(state);
-	return NULL;
-    }
-    if (old_name)
-	Xfree(old_name);
-    (*methods->destroy)(state);
-    return xsl_name;
-}
-
-#else /* X_LOCALE */
-
-#if defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_MSC_VER)
 char *
 _Xsetlocale(
     int           category,
@@ -251,4 +201,3 @@ _XlcMapOSLocaleName(
     return osname;
 }
 
-#endif  /* X_LOCALE */
diff --git a/libX11/src/xlibi18n/Makefile.am b/libX11/src/xlibi18n/Makefile.am
index 853953adc..28b3fe3ec 100644
--- a/libX11/src/xlibi18n/Makefile.am
+++ b/libX11/src/xlibi18n/Makefile.am
@@ -35,8 +35,7 @@ IM_LIBS = \
 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
+	${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la
 
 OM_LIBS = \
 	${top_builddir}/modules/om/generic/libxomGeneric.la
diff --git a/libX11/src/xlibi18n/XlcPubI.h b/libX11/src/xlibi18n/XlcPubI.h
index a83d24305..2e6890d2f 100644
--- a/libX11/src/xlibi18n/XlcPubI.h
+++ b/libX11/src/xlibi18n/XlcPubI.h
@@ -232,12 +232,6 @@ extern void _XlcGetLocaleDataBase(
     int*		/* count */
 );
 
-#ifdef X_LOCALE
-extern char *
-_Xsetlocale(
-    int           category,
-    _Xconst char  *name);
-#else
 #ifdef __APPLE__
 extern char *
 _Xsetlocale(
@@ -247,7 +241,6 @@ _Xsetlocale(
 extern char *_XlcMapOSLocaleName(
     char *osname,
     char *siname);
-#endif
 
 extern int
 _Xmbstoutf8(
diff --git a/libX11/src/xlibi18n/Xlcint.h b/libX11/src/xlibi18n/Xlcint.h
index 95d1f5d5c..ebef95ba1 100644
--- a/libX11/src/xlibi18n/Xlcint.h
+++ b/libX11/src/xlibi18n/Xlcint.h
@@ -932,21 +932,6 @@ extern XLCd _XlcUtf8Loader(
     const char*		name
 );
 
-/* The old EUC locale loader. */
-extern XLCd _XlcEucLoader(
-    const char*		name
-);
-
-/* The old SJIS locale loader. */
-extern XLCd _XlcSjisLoader(
-    const char*		name
-);
-
-/* The old ISO-2022-JP locale loader. */
-extern XLCd _XlcJisLoader(
-    const char*		name
-);
-
 extern XLCd _XlcDynamicLoad(
     const char*		name
 );
diff --git a/libX11/src/xlibi18n/lcInit.c b/libX11/src/xlibi18n/lcInit.c
index 5aaf1832b..e3092f77d 100644
--- a/libX11/src/xlibi18n/lcInit.c
+++ b/libX11/src/xlibi18n/lcInit.c
@@ -106,11 +106,6 @@ Sun Microsystems, Inc. or its licensors is granted.
 #define USE_GENERIC_LOADER
 #define USE_DEFAULT_LOADER
 #define USE_UTF8_LOADER
-#ifdef X_LOCALE
-# define USE_EUC_LOADER
-# define USE_SJIS_LOADER
-# define USE_JIS_LOADER
-#endif
 #endif
 
 /*
@@ -138,18 +133,6 @@ _XlcInitLoader(void)
     _XlcAddLoader(_XlcUtf8Loader, XlcHead);
 #endif
 
-#ifdef USE_EUC_LOADER
-    _XlcAddLoader(_XlcEucLoader, XlcHead);
-#endif
-
-#ifdef USE_SJIS_LOADER
-    _XlcAddLoader(_XlcSjisLoader, XlcHead);
-#endif
-
-#ifdef USE_JIS_LOADER
-    _XlcAddLoader(_XlcJisLoader, XlcHead);
-#endif
-
 #ifdef USE_DYNAMIC_LOADER
     _XlcAddLoader(_XlcDynamicLoader, XlcHead);
 #endif
@@ -177,18 +160,6 @@ _XlcDeInitLoader(void)
     _XlcRemoveLoader(_XlcUtf8Loader);
 #endif
 
-#ifdef USE_EUC_LOADER
-    _XlcRemoveLoader(_XlcEucLoader);
-#endif
-
-#ifdef USE_SJIS_LOADER
-   _XlcRemoveLoader(_XlcSjisLoader);
-#endif
-
-#ifdef USE_JIS_LOADER
-    _XlcRemoveLoader(_XlcJisLoader);
-#endif
-
 #ifdef USE_DYNAMIC_LOADER
     _XlcRemoveLoader(_XlcDynamicLoader);
 #endif
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile
index ec9b946b8..01fcfa26d 100644..100755
--- a/libX11/src/xlibi18n/makefile
+++ b/libX11/src/xlibi18n/makefile
@@ -1,48 +1,5 @@
-#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="\".\"" LIB11_DLL