diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2015-06-28 14:51:08 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-06-29 09:06:40 -0700 |
| commit | c61bc6ed844b39e600cc64e3e552c7bf1894d7ba (patch) | |
| tree | 9339b5149a583451c69d4ddd0117508bd94244ad /src/util | |
| parent | de3e323be1bdc40a2a7d724d0f3db7a81a93bbbb (diff) | |
util: port _mesa_strto[df] to C
_mesa_strtod and _mesa_strtof are only used from the GLSL compiler and
the ARB_[vertex|fragment]_program code, meaning that the locale doesn't
need to be initialized before the first OpenGL context gets initialized.
So let's use explicit initialization from the one-time init code instead
of depending on a C++ compiler to initialize at image-load time.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/util/strtod.c (renamed from src/util/strtod.cpp) | 14 | ||||
| -rw-r--r-- | src/util/strtod.h | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index dc55939182..82df3bcb00 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -19,7 +19,7 @@ MESA_UTIL_FILES := \ set.c \ set.h \ simple_list.h \ - strtod.cpp \ + strtod.c \ strtod.h \ texcompress_rgtc_tmp.h \ u_atomic.h diff --git a/src/util/strtod.cpp b/src/util/strtod.c index 2b4dd982a8..a4a60e0404 100644 --- a/src/util/strtod.cpp +++ b/src/util/strtod.c @@ -30,18 +30,20 @@ #include <locale.h> #ifdef HAVE_XLOCALE_H #include <xlocale.h> +static locale_t loc; #endif #endif #include "strtod.h" +void +_mesa_locale_init(void) +{ #if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -static struct locale_initializer { - locale_initializer() { loc = newlocale(LC_CTYPE_MASK, "C", NULL); } - locale_t loc; -} loc_init; + loc = newlocale(LC_CTYPE_MASK, "C", NULL); #endif +} /** * Wrapper around strtod which uses the "C" locale so the decimal @@ -51,7 +53,7 @@ double _mesa_strtod(const char *s, char **end) { #if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) - return strtod_l(s, end, loc_init.loc); + return strtod_l(s, end, loc); #else return strtod(s, end); #endif @@ -66,7 +68,7 @@ float _mesa_strtof(const char *s, char **end) { #if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) - return strtof_l(s, end, loc_init.loc); + return strtof_l(s, end, loc); #elif defined(HAVE_STRTOF) return strtof(s, end); #else diff --git a/src/util/strtod.h b/src/util/strtod.h index 02c25ddb78..b7e2beb5f3 100644 --- a/src/util/strtod.h +++ b/src/util/strtod.h @@ -31,6 +31,9 @@ extern "C" { #endif +extern void +_mesa_locale_init(void); + extern double _mesa_strtod(const char *s, char **end); |