Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

msvcrt: fix incorrect export

Browse source 
misc

svn path=/trunk/; revision=13364
This commit is contained in:
Gunnar Dalsnes 2005-01-29 22:36:52 +00:00
parent deee81164b
commit 7aefb1c881
4 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/lib/crt/stdio/vfscanf.c
View file

@ -32,7 +32,6 @@
#include <msvcrt/mbstring.h> #include <msvcrt/mbstring.h>
#include <msvcrt/internal/stdio.h> #include <msvcrt/internal/stdio.h>
#define CHECKPOINT1 do{ char a[30]; sprintf(a,"%i\n",__LINE__); OutputDebugStringA(a); } while(0)
#ifdef __USE_W32API #ifdef __USE_W32API
int __set_errno(int err); int __set_errno(int err);
@ -81,7 +80,6 @@ unsigned long int __strtoul_internal (const char *__nptr, char **__endptr, int
} while (0) } while (0)
# define conv_error() do { \ # define conv_error() do { \
funlockfile (s); \ funlockfile (s); \
CHECKPOINT1; \
return done; \ return done; \
} while (0) } while (0)
# define input_error() do { \ # define input_error() do { \
@ -899,18 +897,14 @@ number:
if (flags & (LONG|LONGDBL)) if (flags & (LONG|LONGDBL))
{ {
double d = __strtod_internal (wp, &tw, flags & GROUP); double d = __strtod_internal (wp, &tw, flags & GROUP);
CHECKPOINT1;
if (!(flags & SUPPRESS) && tw != wp){ if (!(flags & SUPPRESS) && tw != wp){
CHECKPOINT1;
*ARG (double *) = negative ? -d : d; *ARG (double *) = negative ? -d : d;
} }
} }
else else
{ {
float d = __strtof_internal (wp, &tw, flags & GROUP); float d = __strtof_internal (wp, &tw, flags & GROUP);
CHECKPOINT1;
if (!(flags & SUPPRESS) && tw != wp){ if (!(flags & SUPPRESS) && tw != wp){
CHECKPOINT1;
*ARG (float *) = negative ? -d : d; *ARG (float *) = negative ? -d : d;
} }
} }

15
reactos/lib/crtdll/makefile
View file

@ -15,7 +15,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_CRTDLL)
# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
RM_AT_FROM_SYMBOLS = no 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 TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
@ -33,21 +33,10 @@ TARGET_CFLAGS += \
-DUSE_MSVCRT_PREFIX \ -DUSE_MSVCRT_PREFIX \
-D_MT -D_MT
TARGET_OBJECTS = $(TARGET_NAME).o TARGET_OBJECTS = dllmain.o
TARGET_CLEAN = dllmain.o
include $(PATH_TO_TOP)/rules.mak include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk include $(TOOLS_PATH)/helper.mk
OBJECTS = dllmain.o
$(TARGET_NAME).o: $(OBJECTS)
$(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
# EOF # EOF

15
reactos/lib/msvcrt/Makefile
View file

@ -15,7 +15,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT)
# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
RM_AT_FROM_SYMBOLS = no 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 TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
@ -33,21 +33,10 @@ TARGET_CFLAGS += \
-DUSE_MSVCRT_PREFIX \ -DUSE_MSVCRT_PREFIX \
-D_MT -D_MT
TARGET_OBJECTS = $(TARGET_NAME).o TARGET_OBJECTS = dllmain.o
TARGET_CLEAN = dllmain.o
include $(PATH_TO_TOP)/rules.mak include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk include $(TOOLS_PATH)/helper.mk
OBJECTS = dllmain.o
$(TARGET_NAME).o: $(OBJECTS)
$(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
# EOF # EOF

2
reactos/lib/msvcrt/msvcrt.def
View file

@ -481,7 +481,7 @@ _scalb
;_scprintf ;_scprintf
;_scwprintf ;_scwprintf
_searchenv _searchenv
_seh_longjmp_unwind@4 _seh_longjmp_unwind=_seh_longjmp_unwind@4
;_set_error_mode ;_set_error_mode
;_set_SSE2_enable ;_set_SSE2_enable
;_set_sbh_threshold ;_set_sbh_threshold