M CMakeLists.txt → CMakeLists.txt

@@ -311,11 +311,13 @@ add_definitions(-D_GNU_SOURCE)
 endif()
 
 include(CheckFunctionExists)
+include(CheckIncludeFiles)
 check_function_exists(strdup HAVE_STRDUP)
 check_function_exists(strndup HAVE_STRNDUP)
 if(NOT DEFINED PSP2)
 	check_function_exists(localtime_r HAVE_LOCALTIME_R)
 endif()
+check_include_files("xlocale.h" HAVE_XLOCALE)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic")
 	check_function_exists(snprintf_l HAVE_SNPRINTF_L)
 	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -373,9 +375,6 @@ endif()
 
 if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE)
 	list(APPEND FUNCTION_DEFINES HAVE_LOCALE)
-	if (HAVE_STRTOF_L)
-		list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L)
-	endif()
 	if (HAVE_SNPRINTF_L)
 		list(APPEND FUNCTION_DEFINES HAVE_SNPRINTF_L)
 	endif()
@@ -383,6 +382,14 @@ endif()
 
 if(HAVE_SETLOCALE)
 	list(APPEND FUNCTION_DEFINES HAVE_SETLOCALE)
+endif()
+
+if (HAVE_STRTOF_L)
+	list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L)
+endif()
+
+if(HAVE_XLOCALE)
+	list(APPEND FUNCTION_DEFINES HAVE_XLOCALE)
 endif()
 
 if(HAVE_CHMOD)

M include/mgba-util/formatting.h → include/mgba-util/formatting.h

@@ -12,8 +12,8 @@ CXX_GUARD_START
 
 #include "locale.h"
 
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#include "xlocale.h"
+#ifdef HAVE_XLOCALE
+#include <xlocale.h>
 #elif !defined(HAVE_LOCALE)
 typedef const char* locale_t;
 #endif