msvcrt: fix incorrect export misc Modified: trunk/reactos/lib/crt/stdio/vfscanf.c Modified: trunk/reactos/lib/crtdll/makefile Modified: trunk/reactos/lib/msvcrt/Makefile Modified: trunk/reactos/lib/msvcrt/msvcrt.def _____
Modified: trunk/reactos/lib/crt/stdio/vfscanf.c --- trunk/reactos/lib/crt/stdio/vfscanf.c 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/crt/stdio/vfscanf.c 2005-01-29 22:36:52 UTC (rev 13364) @@ -32,7 +32,6 @@
#include <msvcrt/mbstring.h> #include <msvcrt/internal/stdio.h>
-#define CHECKPOINT1 do{ char a[30]; sprintf(a,"%i\n",__LINE__); OutputDebugStringA(a); } while(0)
#ifdef __USE_W32API int __set_errno(int err); @@ -81,7 +80,6 @@ } while (0) # define conv_error() do { \ funlockfile (s); \ - CHECKPOINT1; \ return done; \ } while (0) # define input_error() do { \ @@ -899,18 +897,14 @@ if (flags & (LONG|LONGDBL)) { double d = __strtod_internal (wp, &tw, flags & GROUP); - CHECKPOINT1; if (!(flags & SUPPRESS) && tw != wp){ - CHECKPOINT1; *ARG (double *) = negative ? -d : d; } } else { float d = __strtof_internal (wp, &tw, flags & GROUP); - CHECKPOINT1; if (!(flags & SUPPRESS) && tw != wp){ - CHECKPOINT1; *ARG (float *) = negative ? -d : d; } } _____
Modified: trunk/reactos/lib/crtdll/makefile --- trunk/reactos/lib/crtdll/makefile 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/crtdll/makefile 2005-01-29 22:36:52 UTC (rev 13364) @@ -15,7 +15,7 @@
# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no
-TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup +TARGET_LFLAGS = -nostartfiles -nostdlib
TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
@@ -33,21 +33,10 @@ -DUSE_MSVCRT_PREFIX \ -D_MT
-TARGET_OBJECTS = $(TARGET_NAME).o +TARGET_OBJECTS = dllmain.o
-TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
- - - -OBJECTS = dllmain.o - -$(TARGET_NAME).o: $(OBJECTS) - $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o - - # EOF _____
Modified: trunk/reactos/lib/msvcrt/Makefile --- trunk/reactos/lib/msvcrt/Makefile 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/msvcrt/Makefile 2005-01-29 22:36:52 UTC (rev 13364) @@ -15,7 +15,7 @@
# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no
-TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup +TARGET_LFLAGS = -nostartfiles -nostdlib
TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
@@ -33,21 +33,10 @@ -DUSE_MSVCRT_PREFIX \ -D_MT
-TARGET_OBJECTS = $(TARGET_NAME).o +TARGET_OBJECTS = dllmain.o
-TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
- - - -OBJECTS = dllmain.o - -$(TARGET_NAME).o: $(OBJECTS) - $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o - - # EOF _____
Modified: trunk/reactos/lib/msvcrt/msvcrt.def --- trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-29 20:16:48 UTC (rev 13363) +++ trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-29 22:36:52 UTC (rev 13364) @@ -481,7 +481,7 @@
;_scprintf ;_scwprintf _searchenv -_seh_longjmp_unwind@4 +_seh_longjmp_unwind=_seh_longjmp_unwind@4 ;_set_error_mode ;_set_SSE2_enable ;_set_sbh_threshold