Changeset 1904

Timestamp:

Apr 24, 2005, 12:43:00 PM (20 years ago)

Author:

bird

Message:

more intl symbols, configure scripts use stuff which isn't in public headers!

Location:

trunk/src/emx/src/lib

Files:

• lgpl/intl/bindtextdom.c (modified) (1 diff, 1 prop)
• lgpl/intl/dcigettext.c (modified) (1 diff, 1 prop)
• lgpl/intl/loadinfo.h (modified) (2 diffs, 1 prop)
• lgpl/intl/textdomain.c (modified) (1 diff, 1 prop)
• libc.def (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/lgpl/intl/bindtextdom.c

@@ -46 +46 @@
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
-#if !defined(_LIBC)
-# ifdef IN_INNOTEK_LIBC
-# define _nl_default_dirname __libc_nl_default_dirname
-# define _nl_domain_bindings __libc_nl_domain_bindings
-# else
+#if !defined(_LIBC) && !defined(IN_INNOTEK_LIBC)
 # define _nl_default_dirname libintl_nl_default_dirname
 # define _nl_domain_bindings libintl_nl_domain_bindings
-# endif
 #endif
 

trunk/src/emx/src/lib/lgpl/intl/dcigettext.c

@@ -104 +104 @@
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
-#if !defined(_LIBC)
-# ifdef IN_INNOTEK_LIBC
-# define _nl_default_default_domain __libc_nl_default_default_domain
-# define _nl_current_default_domain __libc_nl_current_default_domain
-# define _nl_default_dirname __libc_nl_default_dirname
-# define _nl_domain_bindings __libc_nl_domain_bindings
-# else
+#if !defined(_LIBC) && !defined(IN_INNOTEK_LIBC)
 # define _nl_default_default_domain libintl_nl_default_default_domain
 # define _nl_current_default_domain libintl_nl_current_default_domain
 # define _nl_default_dirname libintl_nl_default_dirname
 # define _nl_domain_bindings libintl_nl_domain_bindings
-# endif
 #endif
 

trunk/src/emx/src/lib/lgpl/intl/loadinfo.h

@@ -83 +83 @@
    names.  The return value is dynamically allocated and has to be
    freed by the caller.  */
-#define _nl_normalize_codeset __libc_nl_normalize_codeset //bird
 extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
                                                   size_t name_len));
 
 
-#define _nl_make_l10nflist __libc__nl_make_l10nflist //bird
 extern struct loaded_l10nfile *
 _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
@@ -99 +97 @@
 
 
-#define _nl_expand_alias __libc_nl_expand_alias //bird
 extern const char *_nl_expand_alias PARAMS ((const char *name));
 
 /* normalized_codeset is dynamically allocated and has to be freed by
    the caller.  */
-#define _nl_explode_name __libc_nl_explode_name //bird
 extern int _nl_explode_name PARAMS ((char *name, const char **language,
                                      const char **modifier,

trunk/src/emx/src/lib/lgpl/intl/textdomain.c

@@ -45 +45 @@
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
-#if !defined(_LIBC)
-# ifdef IN_INNOTEK_LIBC
-# define _nl_default_default_domain __libc_nl_default_default_domain
-# define _nl_current_default_domain __libc_nl_current_default_domain
-# else
+#if !defined(_LIBC) && !defined(IN_INNOTEK_LIBC)
 # define _nl_default_default_domain libintl_nl_default_default_domain
 # define _nl_current_default_domain libintl_nl_current_default_domain
-# endif
 #endif
 

trunk/src/emx/src/lib/libc.def

@@ -1397 +1397 @@
     "___gettext_free_exp" @1407
     "___gettextparse" @1408
-    "___libc__nl_make_l10nflist" @1409
+    "__nl_make_l10nflist" @1409
     "___ngettext" @1410
     "___textdomain" @1411
@@ -1488 +1488 @@
     "___libc_Back_timeHighResNano" @1496
     "__std_gethrtime" @1497
+    ; more intl (configure tests checks for internal variables, arg!)
+    "__nl_current_default_domain" @1498
+    "__nl_default_default_domain" @1499
+    "__nl_default_dirname" @1500
+    "__nl_domain_bindings" @1501
+    "__nl_expand_alias" @1502
+    "__nl_explode_name" @1503
+    "__nl_normalize_codeset" @1504