ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Fix intermittent build failure on OS X

This commit is contained in:
Jeffrey Pfau 2016-06-26 20:31:12 -07:00
parent 0694a87ec2
commit c82ee873e1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -53,6 +53,7 @@ Misc:
- Debugger: CLI debugger now exits when end-of-stream is reached - Debugger: CLI debugger now exits when end-of-stream is reached
- VFS: VFile.sync now updates modified time - VFS: VFile.sync now updates modified time
- GBA: Add overrides for DBZ: Legacy of Goku II and Ueki no Housoku - GBA: Add overrides for DBZ: Legacy of Goku II and Ueki no Housoku
- Util: Fix intermittent build failure on OS X
0.4.0: (2016-02-02) 0.4.0: (2016-02-02)
Features: Features:

2
CMakeLists.txt
View File

@ -250,7 +250,7 @@ if(HAVE_LOCALTIME_R)
list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R) list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R)
endif() endif()
if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE) if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE)
list(APPEND FUNCTION_DEFINES HAVE_LOCALE) list(APPEND FUNCTION_DEFINES HAVE_LOCALE)
if (HAVE_STRTOF_L) if (HAVE_STRTOF_L)
list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L) list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L)

4
src/util/formatting.h
View File

@ -12,9 +12,7 @@
#if defined(__APPLE__) || defined(__FreeBSD__) #if defined(__APPLE__) || defined(__FreeBSD__)
#include "xlocale.h" #include "xlocale.h"
#endif #elif !defined(HAVE_LOCALE)
#ifndef HAVE_LOCALE
typedef const char* locale_t; typedef const char* locale_t;
#endif #endif