Index: trunk/src/odincrt/file.cpp
===================================================================
--- trunk/src/odincrt/file.cpp	(revision 9708)
+++ trunk/src/odincrt/file.cpp	(revision 9709)
@@ -1,3 +1,3 @@
-/* $Id: file.cpp,v 1.3 2000-03-19 11:04:17 sandervl Exp $ */
+/* $Id: file.cpp,v 1.4 2003-01-22 17:06:42 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -8,9 +8,10 @@
  *
  */
+#define ORIGINAL_VAC_FUNCTIONS
 #include <stdio.h>
 #include <os2sel.h>
 #include <wchar.h>
 
-int  _LNK_CONV os2_fclose( FILE *fp )
+int  _LNK_CONV CRTWRAP(fclose)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -22,5 +23,5 @@
 }
 
-int _LNK_CONV os2_feof( FILE *fp )
+int _LNK_CONV CRTWRAP(feof)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -31,5 +32,5 @@
 	return rc;
 }
-int _LNK_CONV os2_ferror( FILE *fp )
+int _LNK_CONV CRTWRAP(ferror)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -41,5 +42,5 @@
 }
 
-int _LNK_CONV os2_fflush( FILE *fp )
+int _LNK_CONV CRTWRAP(fflush)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -51,5 +52,5 @@
 }
 
-int _LNK_CONV os2_fgetc( FILE *fp )
+int _LNK_CONV CRTWRAP(fgetc)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -61,5 +62,5 @@
 }
 
-int _LNK_CONV os2_fgetpos( FILE *fp, fpos_t *pos)
+int _LNK_CONV CRTWRAP(fgetpos)( FILE *fp, fpos_t *pos)
 {
     unsigned short sel = RestoreOS2FS();
@@ -71,5 +72,5 @@
 }
 
-char *_LNK_CONV os2_fgets( char *buf, int size, FILE *fp )
+char *_LNK_CONV CRTWRAP(fgets)( char *buf, int size, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -81,5 +82,5 @@
 }
 
-FILE * _LNK_CONV os2_fopen( const char *name, const char *type)
+FILE * _LNK_CONV CRTWRAP(fopen)( const char *name, const char *type)
 {
     unsigned short sel = RestoreOS2FS();
@@ -91,5 +92,5 @@
 }
 
-int _LNK_CONV os2_fputc( int c, FILE *fp )
+int _LNK_CONV CRTWRAP(fputc)( int c, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -101,5 +102,5 @@
 }
 
-int _LNK_CONV os2_fputs( const char *string, FILE *fp )
+int _LNK_CONV CRTWRAP(fputs)( const char *string, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -111,5 +112,5 @@
 }
 
-size_t _LNK_CONV os2_fread( void *buf, size_t size, size_t elsize, FILE *fp )
+size_t _LNK_CONV CRTWRAP(fread)( void *buf, size_t size, size_t elsize, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -121,5 +122,5 @@
 }
 
-FILE *  _LNK_CONV os2_freopen( const char *name, const char *type, FILE *fp )
+FILE *  _LNK_CONV CRTWRAP(freopen)( const char *name, const char *type, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -131,5 +132,5 @@
 }
 
-int _LNK_CONV os2_fseek( FILE *fp, long int pos, int type)
+int _LNK_CONV CRTWRAP(fseek)( FILE *fp, long int pos, int type)
 {
     unsigned short sel = RestoreOS2FS();
@@ -141,5 +142,5 @@
 }
 
-int _LNK_CONV os2_fsetpos( FILE *fp, const fpos_t *pos)
+int _LNK_CONV CRTWRAP(fsetpos)( FILE *fp, const fpos_t *pos)
 {
     unsigned short sel = RestoreOS2FS();
@@ -151,5 +152,5 @@
 }
 
-long int _LNK_CONV os2_ftell( FILE *fp )
+long int _LNK_CONV CRTWRAP(ftell)( FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -161,5 +162,5 @@
 }
 
-size_t  _LNK_CONV os2_fwrite( const void *buf, size_t size, size_t elsize, FILE *fp )
+size_t  _LNK_CONV CRTWRAP(fwrite)( const void *buf, size_t size, size_t elsize, FILE *fp )
 {
     unsigned short sel = RestoreOS2FS();
@@ -171,5 +172,5 @@
 }
 
-int _LNK_CONV os2_vfprintf( FILE *fp, const char *string, __va_list list )
+int _LNK_CONV CRTWRAP(vfprintf)( FILE *fp, const char *string, __va_list list )
 {
     unsigned short sel = RestoreOS2FS();
@@ -181,5 +182,5 @@
 }
 
-wint_t  _LNK_CONV os2_fgetwc(FILE *fp)
+wint_t  _LNK_CONV CRTWRAP(fgetwc)(FILE *fp)
 {
     unsigned short sel = RestoreOS2FS();
@@ -191,5 +192,5 @@
 }
 
-wchar_t * _LNK_CONV os2_fgetws(wchar_t *buf, int size, FILE *fp)
+wchar_t * _LNK_CONV CRTWRAP(fgetws)(wchar_t *buf, int size, FILE *fp)
 {
     unsigned short sel = RestoreOS2FS();
@@ -201,5 +202,5 @@
 }
 
-wint_t _LNK_CONV os2_fputwc(wchar_t character, FILE *fp)
+wint_t _LNK_CONV CRTWRAP(fputwc)(wchar_t character, FILE *fp)
 {
     unsigned short sel = RestoreOS2FS();
@@ -211,5 +212,5 @@
 }
 
-int _LNK_CONV os2_fputws(const wchar_t *string, FILE *fp)
+int _LNK_CONV CRTWRAP(fputws)(const wchar_t *string, FILE *fp)
 {
     unsigned short sel = RestoreOS2FS();
@@ -221,5 +222,5 @@
 }
 
-FILE * _LNK_CONV os2_fdopen( int a, const char *bla)
+FILE * _LNK_CONV CRTWRAP(fdopen)( int a, const char *bla)
 {
     unsigned short sel = RestoreOS2FS();
Index: trunk/src/odincrt/makefile
===================================================================
--- trunk/src/odincrt/makefile	(revision 9708)
+++ trunk/src/odincrt/makefile	(revision 9709)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.30 2002-08-23 23:41:03 bird Exp $
+# $Id: makefile,v 1.31 2003-01-22 17:06:42 sandervl Exp $
 
 #
@@ -6,104 +6,4 @@
 #       odincrt.dll makefile
 #
-
-!ifdef BUILD_SETUP_MAK
-
-#
-# Setup config
-#
-PATH_ROOT       = ..\..
-!include $(PATH_ROOT)\$(BUILD_SETUP_MAK)
-
-#
-# Just some helper macros.
-#
-_DBG=
-!if "$(BUILD_MODE)" == "DEBUG"
-_DBG=d
-!endif
-!if "$(BUILD_MODE)" == "PROFILE"
-_DBG=p
-!endif
-
-#
-# Target config
-#
-TARGET_MODE     = DLL
-TARGET_NAME     = odincrt$(_DBG)
-TARGET_PUBLIC   = 1
-
-!ifdef WITH_KLIB
-ALL_DEFINES     = -DWITH_KLIB
-!endif
-
-TARGET_OBJS =\
-$(PATH_TARGET)\odincrt.$(EXT_OBJ) \
-$(PATH_TARGET)\initterm.$(EXT_OBJ) \
-!if "$(BUILD_ENV)" != "WAT11C"
-! if "$(BUILD_ENV)" == "VAC308"
-$(PATH_TARGET)\math64.$(EXT_OBJ) \
-! endif
-! ifdef WITH_KLIB
-$(PATH_LIB)\kHeapDbgVACWrappersR3.lib \
-! endif
-$(PATH_TARGET)\malloc.$(EXT_OBJ) \
-$(PATH_TARGET)\string.$(EXT_OBJ) \
-$(PATH_TARGET)\file.$(EXT_OBJ) \
-$(PATH_TARGET)\critsect.$(EXT_OBJ) \
-$(PATH_TARGET)\interlock.$(EXT_OBJ) \
-!else
-#$(PATH_WATCOM)\lib386\os2\..
-!error watcom is broken!
-!endif
-
-TARGET_LIBS = \
-!ifdef WITH_KLIB
-$(PATH_LIB)\kLibR3.lib \
-!endif
-!if "$(BUILD_ENV)" != "WAT11C"
-$(LIB_OS) \
-$(LIB_C_OBJ) \
-somtk.$(EXT_LIB) \
-!else
-clib3r.$(EXT_LIB) plbrdll.$(EXT_LIB) mt7rdll.$(EXT_LIB) \
-!error watcom is broken!
-!endif
-
-# this mess is for finding getting the right .def file.
-!if "$(BUILD_ENV)" == "VAC308"
-_TARGET_DEF     = odincrt$(_DBG).def
-!endif
-!if "$(BUILD_ENV)" == "VAC365"
-_TARGET_DEF     = odin36$(_DBG).def
-!endif
-!if "$(BUILD_ENV)" == "WAT11C"
-_TARGET_DEF     = odinwat$(_DBG).def
-!endif
-!if "$(_TARGET_DEF)" == "" && !$(BUILD_FORWARDING)
-!error "not supported on this compiler yet!"
-!endif
-!ifdef WITH_KLIB
-TARGET_DEF      = $(PATH_TARGET)\$(_TARGET_DEF).klib.$(EXT_DEF)
-!else
-TARGET_DEF      = $(_TARGET_DEF)
-!endif
-
-#
-# Rules config
-#
-!ifdef WITH_KLIB
-RULES_FORWARD = $(TARGET_DEF)
-!endif
-!include $(MAKE_INCLUDE_PROCESS)
-
-!if defined(WITH_KLIB) && !$(BUILD_FORWARDING)
-# Add kLib export to the def-file.
-$(TARGET_DEF): Makefile $(TARGET_DEF_ORG)
-    $(TOOL_CP) $(TARGET_DEF_ORG) $@
-    $(TOOL_ECHO)     kHeapDbgException           @1500 >> $@
-!endif
-
-
-!else
 
 
@@ -187,5 +87,4 @@
 !endif
 $(OBJDIR)\malloc.obj \
-$(OBJDIR)\string.obj \
 $(OBJDIR)\file.obj \
 $(OBJDIR)\critsect.obj \
@@ -234,4 +133,2 @@
 !endif
 
-
-!endif
Index: trunk/src/odincrt/malloc.cpp
===================================================================
--- trunk/src/odincrt/malloc.cpp	(revision 9708)
+++ trunk/src/odincrt/malloc.cpp	(revision 9709)
@@ -1,3 +1,3 @@
-/* $Id: malloc.cpp,v 1.7 2002-09-19 09:38:26 sandervl Exp $ */
+/* $Id: malloc.cpp,v 1.8 2003-01-22 17:06:42 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -8,5 +8,5 @@
  */
 
-//#undef __DEBUG_ALLOC__
+#define ORIGINAL_VAC_FUNCTIONS
 #include <malloc.h>
 #include <umalloc.h>
@@ -48,5 +48,5 @@
 #endif
 
-void * _LNK_CONV os2calloc( size_t a, size_t b )
+void * _LNK_CONV CRTWRAP(calloc)( size_t a, size_t b )
 {
     unsigned short sel = RestoreOS2FS();
@@ -62,5 +62,5 @@
 }
 
-void   _LNK_CONV os2free( void *a )
+void   _LNK_CONV CRTWRAP(free)( void *a )
 {
     unsigned short sel = RestoreOS2FS();
@@ -74,5 +74,5 @@
 }
 
-void * _LNK_CONV os2malloc( size_t a)
+void * _LNK_CONV CRTWRAP(malloc)( size_t a)
 {
     unsigned short sel = RestoreOS2FS();
@@ -89,5 +89,5 @@
 }
 
-void * _LNK_CONV os2realloc( void *a, size_t b)
+void * _LNK_CONV CRTWRAP(realloc)( void *a, size_t b)
 {
     unsigned short sel = RestoreOS2FS();
@@ -103,5 +103,5 @@
 }
 
-void * _LNK_CONV os2_debug_calloc( size_t a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_calloc)( size_t a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -118,5 +118,5 @@
 }
 
-void   _LNK_CONV os2_debug_free( void *a, const char *b, size_t c)
+void   _LNK_CONV CRTWRAP(_debug_free)( void *a, const char *b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -131,5 +131,5 @@
 }
 
-void * _LNK_CONV os2_debug_malloc( size_t a, const char *b, size_t c)
+void * _LNK_CONV CRTWRAP(_debug_malloc)( size_t a, const char *b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -145,5 +145,5 @@
 }
 
-void * _LNK_CONV os2_debug_realloc( void *a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_realloc)( void *a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -158,5 +158,5 @@
 }
 
-void * _LNK_CONV os2_umalloc(Heap_t a, size_t b)
+void * _LNK_CONV CRTWRAP(_umalloc)(Heap_t a, size_t b)
 {
     unsigned short sel = RestoreOS2FS();
@@ -172,5 +172,5 @@
 }
 
-void * _LNK_CONV os2_ucalloc(Heap_t a, size_t b, size_t c)
+void * _LNK_CONV CRTWRAP(_ucalloc)(Heap_t a, size_t b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -186,5 +186,5 @@
 }
 
-void * _LNK_CONV os2_debug_umalloc(Heap_t a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_umalloc)(Heap_t a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -200,5 +200,5 @@
 }
 
-void * _LNK_CONV os2_debug_ucalloc(Heap_t a, size_t b, size_t c, const char *d, size_t e)
+void * _LNK_CONV CRTWRAP(_debug_ucalloc)(Heap_t a, size_t b, size_t c, const char *d, size_t e)
 {
     unsigned short sel = RestoreOS2FS();
Index: trunk/src/odincrt/odin36.def
===================================================================
--- trunk/src/odincrt/odin36.def	(revision 9708)
+++ trunk/src/odincrt/odin36.def	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odin36.def,v 1.7 2002-10-08 09:49:07 sandervl Exp $
+; $Id: odin36.def,v 1.8 2003-01-22 17:06:42 sandervl Exp $
 ; Odin VAC++ 3.6.5 shared multithreaded runtime
 LIBRARY ODINCRT INITINSTANCE TERMINSTANCE
@@ -18,42 +18,42 @@
 ; memory management
 ; -----------------
-       calloc = os2calloc                           @346    NONAME
-       realloc = os2realloc                         @583    NONAME
-       malloc = os2malloc                           @351    NONAME
-       free = os2free                               @219    NONAME
-       _debug_calloc = os2_debug_calloc                 @117    NONAME
-       _debug_realloc = os2_debug_realloc           @182    NONAME
-       _debug_malloc = os2_debug_malloc         @119    NONAME
-       _debug_free = os2_debug_free             @59 NONAME
-       _umalloc = os2_umalloc                           @749    NONAME
-       _debug_umalloc =os2_debug_umalloc                @185    NONAME
-       _ucalloc = os2_ucalloc                           @704    NONAME
-       _debug_ucalloc = os2_debug_ucalloc               @181    NONAME
-    __nw__FUiPCcT1 = os2__nw__FUiPCcT1                  @172    NONAME
-    __dl__FPvPCcUi = os2__dl__FPvPCcUi                  @201    NONAME
-
-    fread = os2_fread                                             @265  NONAME
-    fwrite = os2_fwrite                                            @430 NONAME
-    fopen = os2_fopen                                             @293  NONAME
-    fputc = os2_fputc                                             @305  NONAME
-    fputs = os2_fputs                                             @311  NONAME
-    fsetpos = os2_fsetpos                                           @652    NONAME
-    fclose = os2_fclose                                            @354 NONAME
-    fflush = os2_fflush                                            @370 NONAME
-    freopen = os2_freopen                                           @612    NONAME
-    fgetpos = os2_fgetpos                                           @630    NONAME
-    vfprintf = os2_vfprintf                                          @755   NONAME
-    feof = os2_feof                                              @230   NONAME
-    ferror = os2_ferror                                            @414 NONAME
-    fseek = os2_fseek                                             @271  NONAME
-    ftell = os2_ftell                                             @273  NONAME
-    fgetc = os2_fgetc                                             @262  NONAME
-    fgets = os2_fgets                                            @267   NONAME
-    fgetwc = os2_fgetwc                                            @343 NONAME
-    fgetws = os2_fgetws                                            @369 NONAME
-    fputwc = os2_fputwc                                            @435 NONAME
-    fputws = os2_fputws                                            @478 NONAME
-
-    _fdopen = os2_fdopen                                           @605 NONAME
+       odin_calloc                           @346    NONAME
+       odin_realloc                         @583    NONAME
+       odin_malloc                           @351    NONAME
+       odin_free                               @219    NONAME
+       odin__debug_calloc                 @117    NONAME
+       odin__debug_realloc           @182    NONAME
+       odin__debug_malloc         @119    NONAME
+       odin__debug_free             @59 NONAME
+       odin__umalloc                           @749    NONAME
+       odin__debug_umalloc                @185    NONAME
+       odin__ucalloc                           @704    NONAME
+       odin__debug_ucalloc               @181    NONAME
+    __nw__FUiPCcT1 = odin___nw__FUiPCcT1                  @172    NONAME
+    __dl__FPvPCcUi = odin___dl__FPvPCcUi                  @201    NONAME
+
+    odin_fread                                             @265  NONAME
+    odin_fwrite                                            @430 NONAME
+    odin_fopen                                             @293  NONAME
+    odin_fputc                                             @305  NONAME
+    odin_fputs                                             @311  NONAME
+    odin_fsetpos                                           @652    NONAME
+    odin_fclose                                            @354 NONAME
+    odin_fflush                                            @370 NONAME
+    odin_freopen                                           @612    NONAME
+    odin_fgetpos                                           @630    NONAME
+    odin_vfprintf                                          @755   NONAME
+    odin_feof                                              @230   NONAME
+    odin_ferror                                            @414 NONAME
+    odin_fseek                                             @271  NONAME
+    odin_ftell                                             @273  NONAME
+    odin_fgetc                                             @262  NONAME
+    odin_fgets                                            @267   NONAME
+    odin_fgetwc                                            @343 NONAME
+    odin_fgetws                                            @369 NONAME
+    odin_fputwc                                            @435 NONAME
+    odin_fputws                                            @478 NONAME
+
+    odin_fdopen                                           @605 NONAME
 
 ;;TODO!
@@ -61,7 +61,5 @@
 
      strdup                                     @472    NONAME
-    ;strncpy doesn't stop at 0 terminator!
-    strncpy = __strncpy                                 @751    NONAME
-    __strncpy                                           @919    NONAME
+    strncpy                                      @751    NONAME
 
 ; original exports
Index: trunk/src/odincrt/odin36d.def
===================================================================
--- trunk/src/odincrt/odin36d.def	(revision 9708)
+++ trunk/src/odincrt/odin36d.def	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odin36d.def,v 1.7 2002-10-08 09:49:07 sandervl Exp $
+; $Id: odin36d.def,v 1.8 2003-01-22 17:06:43 sandervl Exp $
 ; Odin VAC++ 3.6.5 shared multithreaded runtime
 LIBRARY ODINCRTD INITINSTANCE TERMINSTANCE
@@ -18,42 +18,42 @@
 ; memory management
 ; -----------------
-       calloc = os2calloc                           @346    NONAME
-       realloc = os2realloc                         @583    NONAME
-       malloc = os2malloc                           @351    NONAME
-       free = os2free                               @219    NONAME
-       _debug_calloc = os2_debug_calloc                 @117    NONAME
-       _debug_realloc = os2_debug_realloc           @182    NONAME
-       _debug_malloc = os2_debug_malloc         @119    NONAME
-       _debug_free = os2_debug_free             @59 NONAME
-       _umalloc = os2_umalloc                           @749    NONAME
-       _debug_umalloc =os2_debug_umalloc                @185    NONAME
-       _ucalloc = os2_ucalloc                           @704    NONAME
-       _debug_ucalloc = os2_debug_ucalloc               @181    NONAME
-    __nw__FUiPCcT1 = os2__nw__FUiPCcT1                  @172    NONAME
-    __dl__FPvPCcUi = os2__dl__FPvPCcUi                  @201    NONAME
-
-    fread = os2_fread                                             @265  NONAME
-    fwrite = os2_fwrite                                            @430 NONAME
-    fopen = os2_fopen                                             @293  NONAME
-    fputc = os2_fputc                                             @305  NONAME
-    fputs = os2_fputs                                             @311  NONAME
-    fsetpos = os2_fsetpos                                           @652    NONAME
-    fclose = os2_fclose                                            @354 NONAME
-    fflush = os2_fflush                                            @370 NONAME
-    freopen = os2_freopen                                           @612    NONAME
-    fgetpos = os2_fgetpos                                           @630    NONAME
-    vfprintf = os2_vfprintf                                          @755   NONAME
-    feof = os2_feof                                              @230   NONAME
-    ferror = os2_ferror                                            @414 NONAME
-    fseek = os2_fseek                                             @271  NONAME
-    ftell = os2_ftell                                             @273  NONAME
-    fgetc = os2_fgetc                                             @262  NONAME
-    fgets = os2_fgets                                            @267   NONAME
-    fgetwc = os2_fgetwc                                            @343 NONAME
-    fgetws = os2_fgetws                                            @369 NONAME
-    fputwc = os2_fputwc                                            @435 NONAME
-    fputws = os2_fputws                                            @478 NONAME
-
-    _fdopen = os2_fdopen                                           @605 NONAME
+       odin_calloc                           @346    NONAME
+       odin_realloc                         @583    NONAME
+       odin_malloc                           @351    NONAME
+       odin_free                               @219    NONAME
+       odin__debug_calloc                 @117    NONAME
+       odin__debug_realloc           @182    NONAME
+       odin__debug_malloc         @119    NONAME
+       odin__debug_free             @59 NONAME
+       odin__umalloc                           @749    NONAME
+       odin__debug_umalloc                @185    NONAME
+       odin__ucalloc                           @704    NONAME
+       odin__debug_ucalloc               @181    NONAME
+    __nw__FUiPCcT1 = odin___nw__FUiPCcT1                  @172    NONAME
+    __dl__FPvPCcUi = odin___dl__FPvPCcUi                  @201    NONAME
+
+    odin_fread                                             @265  NONAME
+    odin_fwrite                                            @430 NONAME
+    odin_fopen                                             @293  NONAME
+    odin_fputc                                             @305  NONAME
+    odin_fputs                                             @311  NONAME
+    odin_fsetpos                                           @652    NONAME
+    odin_fclose                                            @354 NONAME
+    odin_fflush                                            @370 NONAME
+    odin_freopen                                           @612    NONAME
+    odin_fgetpos                                           @630    NONAME
+    odin_vfprintf                                          @755   NONAME
+    odin_feof                                              @230   NONAME
+    odin_ferror                                            @414 NONAME
+    odin_fseek                                             @271  NONAME
+    odin_ftell                                             @273  NONAME
+    odin_fgetc                                             @262  NONAME
+    odin_fgets                                            @267   NONAME
+    odin_fgetwc                                            @343 NONAME
+    odin_fgetws                                            @369 NONAME
+    odin_fputwc                                            @435 NONAME
+    odin_fputws                                            @478 NONAME
+
+    odin_fdopen                                           @605 NONAME
 
 ;;TODO!
@@ -61,7 +61,5 @@
 
      strdup                                     @472    NONAME
-    ;strncpy doesn't stop at 0 terminator!
-    strncpy = __strncpy                                 @751    NONAME
-    __strncpy                                           @919    NONAME
+    strncpy                                      @751    NONAME
 
 ; original exports
Index: trunk/src/odincrt/odincrt.asm
===================================================================
--- trunk/src/odincrt/odincrt.asm	(revision 9708)
+++ trunk/src/odincrt/odincrt.asm	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odincrt.asm,v 1.4 2002-09-19 09:38:27 sandervl Exp $
+; $Id: odincrt.asm,v 1.5 2003-01-22 17:06:43 sandervl Exp $
 
 ;/*
@@ -36,10 +36,10 @@
 __threadid endp
 
-	PUBLIC os2__nw__FUiPCcT1
+	PUBLIC odin___nw__FUiPCcT1
 	EXTERN __nw__FUiPCcT1:NEAR
 ;input: eax = size
 ;       ecx = line nr
 ;       edx = source filename
-os2__nw__FUiPCcT1 proc near
+odin___nw__FUiPCcT1 proc near
 	push	fs
 	push	eax
@@ -59,12 +59,12 @@
 	pop	fs
 	ret
-os2__nw__FUiPCcT1 endp
+odin___nw__FUiPCcT1 endp
 
-	PUBLIC os2__dl__FPvPCcUi
+	PUBLIC odin___dl__FPvPCcUi
 	EXTERN __dl__FPvPCcUi:NEAR
 ;input: eax = this ptr
 ;       ecx = line nr
 ;       edx = source filename
-os2__dl__FPvPCcUi proc near
+odin___dl__FPvPCcUi proc near
 	push	fs
 	push	eax
@@ -84,5 +84,5 @@
 	pop	fs
 	ret
-os2__dl__FPvPCcUi endp
+odin___dl__FPvPCcUi endp
 
         PUBLIC GetFS
Index: trunk/src/odincrt/odincrt.def
===================================================================
--- trunk/src/odincrt/odincrt.def	(revision 9708)
+++ trunk/src/odincrt/odincrt.def	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odincrt.def,v 1.27 2002-10-08 09:49:07 sandervl Exp $
+; $Id: odincrt.def,v 1.28 2003-01-22 17:06:43 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRT INITINSTANCE TERMINSTANCE
@@ -18,42 +18,42 @@
 ; memory management
 ; -----------------
-       calloc = os2calloc                           @346    NONAME
-       realloc = os2realloc                         @583    NONAME
-       malloc = os2malloc                           @351    NONAME
-       free = os2free                               @219    NONAME
-       _debug_calloc = os2_debug_calloc                 @117    NONAME
-       _debug_realloc = os2_debug_realloc           @182    NONAME
-       _debug_malloc = os2_debug_malloc         @119    NONAME
-       _debug_free = os2_debug_free             @59 NONAME
-       _umalloc = os2_umalloc                           @749    NONAME
-       _debug_umalloc =os2_debug_umalloc                @185    NONAME
-       _ucalloc = os2_ucalloc                           @704    NONAME
-       _debug_ucalloc = os2_debug_ucalloc               @181    NONAME
-    __nw__FUiPCcT1 = os2__nw__FUiPCcT1                  @172    NONAME
-    __dl__FPvPCcUi = os2__dl__FPvPCcUi                  @201    NONAME
+       odin_calloc                           @346    NONAME
+       odin_realloc                         @583    NONAME
+       odin_malloc                           @351    NONAME
+       odin_free                               @219    NONAME
+       odin__debug_calloc                 @117    NONAME
+       odin__debug_realloc           @182    NONAME
+       odin__debug_malloc         @119    NONAME
+       odin__debug_free             @59 NONAME
+       odin__umalloc                           @749    NONAME
+       odin__debug_umalloc                @185    NONAME
+       odin__ucalloc                           @704    NONAME
+       odin__debug_ucalloc               @181    NONAME
+    __nw__FUiPCcT1 = odin___nw__FUiPCcT1                  @172    NONAME
+    __dl__FPvPCcUi = odin___dl__FPvPCcUi                  @201    NONAME
 
-    fread = os2_fread                                             @265  NONAME
-    fwrite = os2_fwrite                                            @430 NONAME
-    fopen = os2_fopen                                             @293  NONAME
-    fputc = os2_fputc                                             @305  NONAME
-    fputs = os2_fputs                                             @311  NONAME
-    fsetpos = os2_fsetpos                                           @652    NONAME
-    fclose = os2_fclose                                            @354 NONAME
-    fflush = os2_fflush                                            @370 NONAME
-    freopen = os2_freopen                                           @612    NONAME
-    fgetpos = os2_fgetpos                                           @630    NONAME
-    vfprintf = os2_vfprintf                                          @755   NONAME
-    feof = os2_feof                                              @230   NONAME
-    ferror = os2_ferror                                            @414 NONAME
-    fseek = os2_fseek                                             @271  NONAME
-    ftell = os2_ftell                                             @273  NONAME
-    fgetc = os2_fgetc                                             @262  NONAME
-    fgets = os2_fgets                                            @267   NONAME
-    fgetwc = os2_fgetwc                                            @343 NONAME
-    fgetws = os2_fgetws                                            @369 NONAME
-    fputwc = os2_fputwc                                            @435 NONAME
-    fputws = os2_fputws                                            @478 NONAME
+    odin_fread                                             @265  NONAME
+    odin_fwrite                                            @430 NONAME
+    odin_fopen                                             @293  NONAME
+    odin_fputc                                             @305  NONAME
+    odin_fputs                                             @311  NONAME
+    odin_fsetpos                                           @652    NONAME
+    odin_fclose                                            @354 NONAME
+    odin_fflush                                            @370 NONAME
+    odin_freopen                                           @612    NONAME
+    odin_fgetpos                                           @630    NONAME
+    odin_vfprintf                                          @755   NONAME
+    odin_feof                                              @230   NONAME
+    odin_ferror                                            @414 NONAME
+    odin_fseek                                             @271  NONAME
+    odin_ftell                                             @273  NONAME
+    odin_fgetc                                             @262  NONAME
+    odin_fgets                                            @267   NONAME
+    odin_fgetwc                                            @343 NONAME
+    odin_fgetws                                            @369 NONAME
+    odin_fputwc                                            @435 NONAME
+    odin_fputws                                            @478 NONAME
 
-    _fdopen = os2_fdopen                                           @605 NONAME
+    odin_fdopen                                           @605 NONAME
 
 ;;TODO!
@@ -61,7 +61,5 @@
 
      strdup                                     @472    NONAME
-    ;strncpy doesn't stop at 0 terminator!
-    strncpy = __strncpy                                 @751    NONAME
-    __strncpy                                           @919    NONAME
+    strncpy                                      @751    NONAME
 
 ; original exports
Index: trunk/src/odincrt/odincrtd.def
===================================================================
--- trunk/src/odincrt/odincrtd.def	(revision 9708)
+++ trunk/src/odincrt/odincrtd.def	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odincrtd.def,v 1.8 2002-10-08 09:49:08 sandervl Exp $
+; $Id: odincrtd.def,v 1.9 2003-01-22 17:06:44 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRTD INITINSTANCE TERMINSTANCE
@@ -18,42 +18,42 @@
 ; memory management
 ; -----------------
-       calloc = os2calloc                           @346    NONAME
-       realloc = os2realloc                         @583    NONAME
-       malloc = os2malloc                           @351    NONAME
-       free = os2free                               @219    NONAME
-       _debug_calloc = os2_debug_calloc                 @117    NONAME
-       _debug_realloc = os2_debug_realloc           @182    NONAME
-       _debug_malloc = os2_debug_malloc         @119    NONAME
-       _debug_free = os2_debug_free             @59 NONAME
-       _umalloc = os2_umalloc                           @749    NONAME
-       _debug_umalloc =os2_debug_umalloc                @185    NONAME
-       _ucalloc = os2_ucalloc                           @704    NONAME
-       _debug_ucalloc = os2_debug_ucalloc               @181    NONAME
-    __nw__FUiPCcT1 = os2__nw__FUiPCcT1                  @172    NONAME
-    __dl__FPvPCcUi = os2__dl__FPvPCcUi                  @201    NONAME
-
-    fread = os2_fread                                             @265  NONAME
-    fwrite = os2_fwrite                                            @430 NONAME
-    fopen = os2_fopen                                             @293  NONAME
-    fputc = os2_fputc                                             @305  NONAME
-    fputs = os2_fputs                                             @311  NONAME
-    fsetpos = os2_fsetpos                                           @652    NONAME
-    fclose = os2_fclose                                            @354 NONAME
-    fflush = os2_fflush                                            @370 NONAME
-    freopen = os2_freopen                                           @612    NONAME
-    fgetpos = os2_fgetpos                                           @630    NONAME
-    vfprintf = os2_vfprintf                                          @755   NONAME
-    feof = os2_feof                                              @230   NONAME
-    ferror = os2_ferror                                            @414 NONAME
-    fseek = os2_fseek                                             @271  NONAME
-    ftell = os2_ftell                                             @273  NONAME
-    fgetc = os2_fgetc                                             @262  NONAME
-    fgets = os2_fgets                                            @267   NONAME
-    fgetwc = os2_fgetwc                                            @343 NONAME
-    fgetws = os2_fgetws                                            @369 NONAME
-    fputwc = os2_fputwc                                            @435 NONAME
-    fputws = os2_fputws                                            @478 NONAME
-
-    _fdopen = os2_fdopen                                           @605 NONAME
+       odin_calloc                           @346    NONAME
+       odin_realloc                         @583    NONAME
+       odin_malloc                           @351    NONAME
+       odin_free                               @219    NONAME
+       odin__debug_calloc                 @117    NONAME
+       odin__debug_realloc           @182    NONAME
+       odin__debug_malloc         @119    NONAME
+       odin__debug_free             @59 NONAME
+       odin__umalloc                           @749    NONAME
+       odin__debug_umalloc                @185    NONAME
+       odin__ucalloc                           @704    NONAME
+       odin__debug_ucalloc               @181    NONAME
+    __nw__FUiPCcT1 = odin___nw__FUiPCcT1                  @172    NONAME
+    __dl__FPvPCcUi = odin___dl__FPvPCcUi                  @201    NONAME
+
+    odin_fread                                             @265  NONAME
+    odin_fwrite                                            @430 NONAME
+    odin_fopen                                             @293  NONAME
+    odin_fputc                                             @305  NONAME
+    odin_fputs                                             @311  NONAME
+    odin_fsetpos                                           @652    NONAME
+    odin_fclose                                            @354 NONAME
+    odin_fflush                                            @370 NONAME
+    odin_freopen                                           @612    NONAME
+    odin_fgetpos                                           @630    NONAME
+    odin_vfprintf                                          @755   NONAME
+    odin_feof                                              @230   NONAME
+    odin_ferror                                            @414 NONAME
+    odin_fseek                                             @271  NONAME
+    odin_ftell                                             @273  NONAME
+    odin_fgetc                                             @262  NONAME
+    odin_fgets                                            @267   NONAME
+    odin_fgetwc                                            @343 NONAME
+    odin_fgetws                                            @369 NONAME
+    odin_fputwc                                            @435 NONAME
+    odin_fputws                                            @478 NONAME
+
+    odin_fdopen                                           @605 NONAME
 
 ;;TODO!
@@ -61,7 +61,5 @@
 
      strdup                                     @472    NONAME
-    ;strncpy doesn't stop at 0 terminator!
-    strncpy = __strncpy                                 @751    NONAME
-    __strncpy                                           @919    NONAME
+    strncpy                                      @751    NONAME
 
 ; original exports
Index: trunk/src/odincrt/odincrtp.def
===================================================================
--- trunk/src/odincrt/odincrtp.def	(revision 9708)
+++ trunk/src/odincrt/odincrtp.def	(revision 9709)
@@ -1,3 +1,3 @@
-; $Id: odincrtp.def,v 1.5 2002-10-08 09:49:08 sandervl Exp $
+; $Id: odincrtp.def,v 1.6 2003-01-22 17:06:44 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRTP INITINSTANCE TERMINSTANCE
@@ -29,42 +29,42 @@
 ; memory management
 ; -----------------
-       calloc = os2calloc                           @346    NONAME
-       realloc = os2realloc                         @583    NONAME
-       malloc = os2malloc                           @351    NONAME
-       free = os2free                               @219    NONAME
-       _debug_calloc = os2_debug_calloc                 @117    NONAME
-       _debug_realloc = os2_debug_realloc           @182    NONAME
-       _debug_malloc = os2_debug_malloc         @119    NONAME
-       _debug_free = os2_debug_free             @59 NONAME
-       _umalloc = os2_umalloc                           @749    NONAME
-       _debug_umalloc =os2_debug_umalloc                @185    NONAME
-       _ucalloc = os2_ucalloc                           @704    NONAME
-       _debug_ucalloc = os2_debug_ucalloc               @181    NONAME
-    __nw__FUiPCcT1 = os2__nw__FUiPCcT1                  @172    NONAME
-    __dl__FPvPCcUi = os2__dl__FPvPCcUi                  @201    NONAME
-
-    fread = os2_fread                                             @265  NONAME
-    fwrite = os2_fwrite                                            @430 NONAME
-    fopen = os2_fopen                                             @293  NONAME
-    fputc = os2_fputc                                             @305  NONAME
-    fputs = os2_fputs                                             @311  NONAME
-    fsetpos = os2_fsetpos                                           @652    NONAME
-    fclose = os2_fclose                                            @354 NONAME
-    fflush = os2_fflush                                            @370 NONAME
-    freopen = os2_freopen                                           @612    NONAME
-    fgetpos = os2_fgetpos                                           @630    NONAME
-    vfprintf = os2_vfprintf                                          @755   NONAME
-    feof = os2_feof                                              @230   NONAME
-    ferror = os2_ferror                                            @414 NONAME
-    fseek = os2_fseek                                             @271  NONAME
-    ftell = os2_ftell                                             @273  NONAME
-    fgetc = os2_fgetc                                             @262  NONAME
-    fgets = os2_fgets                                            @267   NONAME
-    fgetwc = os2_fgetwc                                            @343 NONAME
-    fgetws = os2_fgetws                                            @369 NONAME
-    fputwc = os2_fputwc                                            @435 NONAME
-    fputws = os2_fputws                                            @478 NONAME
-
-    _fdopen = os2_fdopen                                           @605 NONAME
+       odin_calloc                           @346    NONAME
+       odin_realloc                         @583    NONAME
+       odin_malloc                           @351    NONAME
+       odin_free                               @219    NONAME
+       odin__debug_calloc                 @117    NONAME
+       odin__debug_realloc           @182    NONAME
+       odin__debug_malloc         @119    NONAME
+       odin__debug_free             @59 NONAME
+       odin__umalloc                           @749    NONAME
+       odin__debug_umalloc                @185    NONAME
+       odin__ucalloc                           @704    NONAME
+       odin__debug_ucalloc               @181    NONAME
+    __nw__FUiPCcT1 = odin___nw__FUiPCcT1                  @172    NONAME
+    __dl__FPvPCcUi = odin___dl__FPvPCcUi                  @201    NONAME
+
+    odin_fread                                             @265  NONAME
+    odin_fwrite                                            @430 NONAME
+    odin_fopen                                             @293  NONAME
+    odin_fputc                                             @305  NONAME
+    odin_fputs                                             @311  NONAME
+    odin_fsetpos                                           @652    NONAME
+    odin_fclose                                            @354 NONAME
+    odin_fflush                                            @370 NONAME
+    odin_freopen                                           @612    NONAME
+    odin_fgetpos                                           @630    NONAME
+    odin_vfprintf                                          @755   NONAME
+    odin_feof                                              @230   NONAME
+    odin_ferror                                            @414 NONAME
+    odin_fseek                                             @271  NONAME
+    odin_ftell                                             @273  NONAME
+    odin_fgetc                                             @262  NONAME
+    odin_fgets                                            @267   NONAME
+    odin_fgetwc                                            @343 NONAME
+    odin_fgetws                                            @369 NONAME
+    odin_fputwc                                            @435 NONAME
+    odin_fputws                                            @478 NONAME
+
+    odin_fdopen                                           @605 NONAME
 
 ;;TODO!
@@ -72,7 +72,5 @@
 
      strdup                                     @472    NONAME
-    ;strncpy doesn't stop at 0 terminator!
-    strncpy = __strncpy                                 @751    NONAME
-    __strncpy                                           @919    NONAME
+    strncpy                                      @751    NONAME
 
 ; original exports
