Changeset 23494 for lang/c

Timestamp:

11/13/08 03:14:29 (5 years ago)

Author:

saturday06

Message:

sttic inline

Files:

• lang/c/libintl-msvc/recipes/libintl.h (modified) (5 diffs)

lang/c/libintl-msvc/recipes/libintl.h

@@ -413 +413 @@
 
     /* Wide character support.  */
+    /* XXX inline ! */
+#ifdef _INTL_REDIRECT_INLINE
+#define WIDE_LIBINTL_STATIC_INLINE static inline
+#elif defined(_MSC_VER)
+#define WIDE_LIBINTL_STATIC_INLINE static _inline
+#else
+#define WIDE_LIBINTL_STATIC_INLINE static
+#endif
+
 #define wgettext(msgid) wgettext_(msgid, L##msgid)
 #define dwgettext(domainname, msgid) dwgettext_(domainname, msgid, L##msgid)
@@ -420 +429 @@
 #define dcnwgettext(domainname, msgid1, msgid2, n, category) dnwgettext_(domainname, msgid1, msgid2, n, L##msgid1,  L##msgid2)
 
-    static const wchar_t* wgettext_(const char* msgid, const wchar_t* wmsgid) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* wgettext_(const char* msgid, const wchar_t* wmsgid) {
         const char* translated = gettext(msgid);
         return translated != msgid ? (const wchar_t*)translated : wmsgid;
     }
 
-    static const wchar_t* dwgettext_(const char *domainname, const char* msgid, const wchar_t* wmsgid) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* dwgettext_(const char *domainname, const char* msgid, const wchar_t* wmsgid) {
         const char* translated = dgettext(domainname, msgid);
         return translated != msgid ? (const wchar_t*)translated : wmsgid;
     }
 
-    static const wchar_t* dcwgettext_(const char *domainname, const char* msgid, int category,  const wchar_t* wmsgid) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* dcwgettext_(const char *domainname, const char* msgid, int category,  const wchar_t* wmsgid) {
         const char* translated = dcgettext(domainname, msgid, category);
         return translated != msgid ? (const wchar_t*)translated : wmsgid;
     }
 
-    static const wchar_t* nwgettext_(const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* nwgettext_(const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) {
         const char* translated = ngettext(msgid1, msgid2, n);
         return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated);
     }
 
-    static const wchar_t* dnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* dnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) {
         const char* translated = dngettext(domainname, msgid1, msgid2, n);
         return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated);
     }
 
-    static const wchar_t* dcnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2, int category) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* dcnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2, int category) {
         const char* translated = dcngettext(domainname, msgid1, msgid2, n, category);
         return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated);
@@ -471 +486 @@
 #define wbindtextdomain windows_wbindtextdomain
 
-    static const wchar_t* windows_wbindtextdomain(const char* domainname, const wchar_t* dirname16) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const wchar_t* windows_wbindtextdomain(const char* domainname, const wchar_t* dirname16) {
         char* dirname8 = NULL;
         unsigned int num_elements = 0;
@@ -504 +520 @@
     }
 
-    static const char* windows_bindtextdomain(const char* domainname, const char* dirname) {
+    WIDE_LIBINTL_STATIC_INLINE 
+    const char* windows_bindtextdomain(const char* domainname, const char* dirname) {
         wchar_t* dirname16 = NULL;
         unsigned int num_elements = 0;
@@ -548 +565 @@
 
 #endif /* (defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && !defined(__CYGWIN__) */
+#undef WIDE_LIBINTL_STATIC_INLINE 
 
 #endif /* libintl.h */