[tyndur-devel] [PATCH 4/6] libc: localeconv nicht static inline machen

[Kevin Wolf <kevin@xxxxxxxxxx>]

* libc: C++ stoert sich am C99-Initializer, also woanders hin damit...

Signed-off-by: Kevin Wolf <kevin@xxxxxxxxxx>
---
 src/modules/include/locale.h   |   18 +--------------
 src/modules/lib/posix/locale.c |   47 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 src/modules/lib/posix/locale.c

diff --git a/src/modules/include/locale.h b/src/modules/include/locale.h
index 13af482..5a1c4c2 100644
--- a/src/modules/include/locale.h
+++ b/src/modules/include/locale.h
@@ -81,23 +81,7 @@ enum {
 /**
  * Gibt Informationen zur aktiven Locale zurueck
  */
-static inline struct lconv* localeconv(void)
-{
-    static struct lconv lconv = {
-        .decimal_point = ",",
-        .thousands_sep = " ",
-        .mon_decimal_point = ",",
-        .mon_thousands_sep = " ",
-        .int_curr_symbol = "EUR",
-        .currency_symbol = "EUR",
-        .positive_sign = "+",
-        .negative_sign = "-",
-        .p_sign_posn = 1,
-        .n_sign_posn = 1,
-    };
-
-    return &lconv;
-};
+struct lconv* localeconv(void);
 
 /**
  * Aktuelles Locale anpassen. Ist locale == NULL wird nichts gemacht.
diff --git a/src/modules/lib/posix/locale.c b/src/modules/lib/posix/locale.c
new file mode 100644
index 0000000..96614b9
--- /dev/null
+++ b/src/modules/lib/posix/locale.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010 The tyndur Project. All rights reserved.
+ *
+ * This code is derived from software contributed to the tyndur Project
+ * by Kevin Wolf.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <locale.h>
+
+struct lconv* localeconv(void)
+{
+    static struct lconv lconv = {
+        .decimal_point = ",",
+        .thousands_sep = " ",
+        .mon_decimal_point = ",",
+        .mon_thousands_sep = " ",
+        .int_curr_symbol = "EUR",
+        .currency_symbol = "EUR",
+        .positive_sign = "+",
+        .negative_sign = "-",
+        .p_sign_posn = 1,
+        .n_sign_posn = 1,
+    };
+
+    return &lconv;
+}
-- 
1.6.0.2