Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1335,11 +1335,11 @@
 	AC_CHECK_FUNCS([fcntl nanosleep])
 	;;
 esac
 
 AC_CHECK_HEADERS(xlocale.h)
-AC_CHECK_FUNCS([strtod_l strtof_l asprintf_l])
+AC_CHECK_FUNCS([strtod_l strtof_l asprintf_l uselocale])
 AS_IF([test x"$gnu_source" != x"yes" -a \( \
     x"$ac_cv_func_strtod_l" = x"yes" -o x"$ac_cv_func_strtof_l" = x"yes" -o \
     x"$ac_cv_func_asprintf_l" = x"yes" \)], [
 	AC_MSG_CHECKING(whether *_l functions need _GNU_SOURCE)
 	AC_COMPILE_IFELSE([

Index: src/OFASPrintF.m
==================================================================
--- src/OFASPrintF.m
+++ src/OFASPrintF.m
@@ -23,11 +23,11 @@
 
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif
 
-#ifdef HAVE_ASPRINTF_L
+#if defined(HAVE_ASPRINTF_L) || defined(HAVE_USELOCALE)
 # include <locale.h>
 #endif
 #ifdef HAVE_XLOCALE_H
 # include <xlocale.h>
 #endif
@@ -81,11 +81,11 @@
 		lengthModifierCapitalL
 	} lengthModifier;
 	bool useLocale;
 };
 
-#ifdef HAVE_ASPRINTF_L
+#if defined(HAVE_ASPRINTF_L) || defined(HAVE_USELOCALE)
 static locale_t cLocale;
 
 OF_CONSTRUCTOR()
 {
 	if ((cLocale = newlocale(LC_ALL_MASK, "C", NULL)) == NULL)
@@ -375,11 +375,11 @@
 static bool
 formatConversionSpecifierState(struct Context *ctx)
 {
 	char *tmp = NULL;
 	int tmpLen = 0;
-#ifndef HAVE_ASPRINTF_L
+#if !defined(HAVE_ASPRINTF_L) && !defined(HAVE_USELOCALE)
 	OFString *point;
 #endif
 
 	if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
 		return false;
@@ -546,43 +546,57 @@
 	case 'a':
 	case 'A':
 		switch (ctx->lengthModifier) {
 		case lengthModifierNone:
 		case lengthModifierL:
-#ifdef HAVE_ASPRINTF_L
+#if defined(HAVE_ASPRINTF_L)
 			if (!ctx->useLocale)
 				tmpLen = asprintf_l(&tmp, cLocale,
 				    ctx->subformat,
 				    va_arg(ctx->arguments, double));
 			else
+#elif defined(HAVE_USELOCALE)
+			if (!ctx->useLocale) {
+				locale_t previousLocale = uselocale(cLocale);
+				tmpLen = asprintf(&tmp, ctx->subformat,
+				    va_arg(ctx->arguments, double));
+				uselocale(previousLocale);
+			} else
 #endif
 				tmpLen = asprintf(&tmp, ctx->subformat,
 				    va_arg(ctx->arguments, double));
 			break;
 		case lengthModifierCapitalL:
-#ifdef HAVE_ASPRINTF_L
+#if defined(HAVE_ASPRINTF_L)
 			if (!ctx->useLocale)
 				tmpLen = asprintf_l(&tmp, cLocale,
 				    ctx->subformat,
 				    va_arg(ctx->arguments, long double));
 			else
+#elif defined(HAVE_USELOCALE)
+			if (!ctx->useLocale) {
+				locale_t previousLocale = uselocale(cLocale);
+				tmpLen = asprintf(&tmp, ctx->subformat,
+				    va_arg(ctx->arguments, long double));
+				uselocale(previousLocale);
+			} else
 #endif
 				tmpLen = asprintf(&tmp, ctx->subformat,
 				    va_arg(ctx->arguments, long double));
 			break;
 		default:
 			return false;
 		}
 
-#ifndef HAVE_ASPRINTF_L
+#if !defined(HAVE_ASPRINTF_L) && !defined(HAVE_USELOCALE)
 		if (tmpLen == -1)
 			return false;
 
 		/*
-		 * If there's no asprintf_l, we have no other choice than to
-		 * use this ugly hack to replace the locale's decimal point
-		 * back to ".".
+		 * If there's no asprintf_l and no uselocale, we have no other
+		 * choice than to use this ugly hack to replace the locale's
+		 * decimal point back to ".".
 		 */
 		point = [OFLocale decimalSeparator];
 
 		if (!ctx->useLocale && point != nil && ![point isEqual: @"."]) {
 			void *pool = objc_autoreleasePoolPush();

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -20,11 +20,11 @@
 #include <math.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
+#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE)
 # include <locale.h>
 #endif
 #ifdef HAVE_XLOCALE_H
 # include <xlocale.h>
 #endif
@@ -80,11 +80,11 @@
 
 static struct {
 	Class isa;
 } placeholder;
 
-#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
+#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE)
 static locale_t cLocale;
 #endif
 
 @interface OFString ()
 - (size_t)of_getCString: (char *)cString
@@ -625,11 +625,11 @@
 	if (self != [OFString class])
 		return;
 
 	placeholder.isa = [OFStringPlaceholder class];
 
-#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
+#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE)
 	if ((cLocale = newlocale(LC_ALL_MASK, "C", NULL)) == NULL)
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 #endif
 }
@@ -2424,11 +2424,11 @@
 	if ([stripped caseInsensitiveCompare: @"NAN"] == OFOrderedSame)
 		return NAN;
 	if ([stripped caseInsensitiveCompare: @"-NAN"] == OFOrderedSame)
 		return -NAN;
 
-#ifdef HAVE_STRTOF_L
+#if defined(HAVE_STRTOF_L) || defined(HAVE_USELOCALE)
 	const char *UTF8String = self.UTF8String;
 #else
 	/*
 	 * If we have no strtof_l, we have no other choice but to replace "."
 	 * with the locale's decimal point.
@@ -2440,12 +2440,16 @@
 #endif
 	char *endPtr = NULL;
 	float value;
 
 	errno = 0;
-#ifdef HAVE_STRTOF_L
+#if defined(HAVE_STRTOF_L)
 	value = strtof_l(UTF8String, &endPtr, cLocale);
+#elif defined(HAVE_USELOCALE)
+	locale_t previousLocale = uselocale(cLocale);
+	value = strtof(UTF8String, &endPtr);
+	uselocale(previousLocale);
 #else
 	value = strtof(UTF8String, &endPtr);
 #endif
 
 	if (value == HUGE_VALF && errno == ERANGE)
@@ -2477,11 +2481,11 @@
 	if ([stripped caseInsensitiveCompare: @"NAN"] == OFOrderedSame)
 		return NAN;
 	if ([stripped caseInsensitiveCompare: @"-NAN"] == OFOrderedSame)
 		return -NAN;
 
-#ifdef HAVE_STRTOD_L
+#if defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE)
 	const char *UTF8String = self.UTF8String;
 #else
 	/*
 	 * If we have no strtod_l, we have no other choice but to replace "."
 	 * with the locale's decimal point.
@@ -2493,12 +2497,16 @@
 #endif
 	char *endPtr = NULL;
 	double value;
 
 	errno = 0;
-#ifdef HAVE_STRTOD_L
+#if defined(HAVE_STRTOD_L)
+	value = strtod_l(UTF8String, &endPtr, cLocale);
+#elif defined(HAVE_USELOCALE)
+	locale_t previousLocale = uselocale(cLocale);
 	value = strtod_l(UTF8String, &endPtr, cLocale);
+	uselocale(previousLocale);
 #else
 	value = strtod(UTF8String, &endPtr);
 #endif
 
 	if (value == HUGE_VAL && errno == ERANGE)