Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / text / charset.c

diff --git a/src/text/charset.c b/src/text/charset.c
index 6d4d2a7b4030f64b3d1c249cde0c29144c99babc..07b814ee09a9a372195fb1f915fff25471d20d9a 100644 (file)
--- a/src/text/charset.c
+++ b/src/text/charset.c
@@ -36,7 +36,6 @@
 #endif
 
 #ifdef __APPLE__
-#   include <errno.h>
 #   include <string.h>
 #   include <xlocale.h>
 #endif
@@ -91,6 +90,26 @@ double us_strtod( const char *str, char **end )
     return res;
 }
 
+
+/**
+ * us_strtof() has the same prototype as ANSI C strtof() but it uses the
+ * POSIX/C decimal format, regardless of the current numeric locale.
+ */
+float us_strtof( const char *str, char **end )
+{
+    locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+    locale_t oldloc = uselocale (loc);
+    float res = strtof (str, end);
+
+    if (loc != (locale_t)0)
+    {
+        uselocale (oldloc);
+        freelocale (loc);
+    }
+    return res;
+}
+
+
 /**
  * us_atof() has the same prototype as ANSI C atof() but it expects a dot
  * as decimal separator, regardless of the system locale.