Changeset 499

Timestamp:

Aug 1, 2003, 3:51:58 PM (22 years ago)

Author:

zap

Message:

Fixed so that everything compiles now.

Location:

trunk/src/emx/src/lib

Files:

• libc.def (modified) (9 diffs, 1 prop)
• locale/locale_collate.c (modified) (1 diff, 1 prop)

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

@@ -8 +8 @@
 ; At the moment we tollerate that a patch level adds new exports.
 ;
-; Also note that whenever something is added (premanently) one should manually
+; Also note that whenever something is added (permanently) one should manually
 ; check that data exports aren't mixed into the code exports. Mixing exports
-; causes more export buckets to be issued and will inscrease overhead during
+; causes more export bundles to be issued and will inscrease overhead during
 ; import resolving.
 ;
@@ -19 +19 @@
 EXPORTS
 ; data
-    "__ctype" @1
-    "__cur_lcf_time" @2
-    "__cur_lconv" @3
-    "__cur_mbyte" @4
     "__daylight" @5
     "__fdvec_head" @6
@@ -281 +277 @@
     "_isalnum" @309
     "_isalpha" @310
-    "__isascii" @311
     "_iscntrl" @312
     "_isdigit" @313
@@ -301 +296 @@
     "_isupper" @329
     "_isxdigit" @330
-    "__itoa" @331
-    "__lc_table" @332
     "__libc_16to32" @333
     "__libc_32to16" @334
     "__libc_thunk1" @335
-    "__lltoa" @336
     "__loc2gmt" @337
-    "__localeconv" @338
-    "_localeconv" @339
     "__localtime" @340
     "___lseek" @341
-    "__ltoa" @342
     "__makepath" @343
-    "__mbtowc" @344
     "__memcount" @345
     "__memdif" @346
@@ -359 +347 @@
     "___select" @395
     "__setdummymore" @396
-    "_setlocale" @397
     "__setmore" @398
     "___settime" @399
@@ -718 +705 @@
     "__sys_shrink_heap_to" @754
     "___wait" @755
-    "__wctomb" @756
     "__sys_sig_valid" @757
     "___waitpid" @758
@@ -743 +729 @@
     "__tmpidxnam" @779
     "__tmpidx_unlock" @780
-    "__toascii" @781
     "_tolower" @782
     "_toupper" @783
@@ -765 +750 @@
     "__uldiv" @801
     "___ulimit" @802
-    "__ulltoa" @803
-    "__ultoa" @804
     "__um_addmem_nolock" @805
     "__umalloc" @806
@@ -799 +782 @@
     "__utdefault" @835
     "___utimes" @836
+    "___convert_codepage" @837
+    "___digits" @838
+    "___do_Unicode" @839
+    "___from_ucs" @840
+    "_isascii" @841
+    "___locale" @842
+    "___locale_C" @843
+    "___locale_collate" @844
+    "___locale_ctype" @845
+    "___locale_lconv" @846
+    "___locale_time" @847
+    "__std_lltoa" @848
+    "__std_localeconv" @849
+    "__std_ltoa" @850
+    "__std_setlocale" @851
+    "__std_ulltoa" @852
+    "__std_ultoa" @853
+    "_toascii" @854
+    "___to_ucs" @855

trunk/src/emx/src/lib/locale/locale_collate.c

@@ -12 +12 @@
 #include <string.h>
 
-struct __locale_collate __locale_collate;
+struct __locale_collate __locale_collate =
+{
+  /* Nothing here; just to make sure ILINK can export it from the DLL */
+  /*@@@ to be removed when emxomfar is fixed @@@*/
+};
 
 static void __attribute__((constructor)) __locale_collate_init ()