From ae32243b6a587f3d1b18b0011c50b690753064aa Mon Sep 17 00:00:00 2001 From: Rex Jolliff Date: Fri, 21 May 1999 18:47:44 +0000 Subject: [PATCH] patches to get v14 to compile. svn path=/trunk/; revision=503 --- reactos/lib/crtdll/crtdll.def | 12 ++++++------ reactos/lib/crtdll/makefile | 2 +- reactos/lib/crtdll/stdlib/ecvtbuf.c | 4 ++-- reactos/lib/crtdll/stdlib/fcvtbuf.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/reactos/lib/crtdll/crtdll.def b/reactos/lib/crtdll/crtdll.def index c413bcaf1b0..5f0bc42eb07 100644 --- a/reactos/lib/crtdll/crtdll.def +++ b/reactos/lib/crtdll/crtdll.def @@ -17,9 +17,9 @@ ; DISCLAMED. This includes but is not limited to warrenties of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ; -; $Revision: 1.10 $ -; $Author: ariadne $ -; $Date: 1999/05/18 18:16:11 $ +; $Revision: 1.11 $ +; $Author: rex $ +; $Date: 1999/05/21 18:47:43 $ ; ; These three functions appear to be name mangled in some way, so GCC is ; probably not going to be able to use them in any case. @@ -66,7 +66,7 @@ __fpecode __isascii __iscsym __iscsymf -__mb_cur_max_dll +;__mb_cur_max_dll __pxcptinfoptrs __threadhandle __threadid @@ -454,7 +454,7 @@ isxdigit labs ldexp ldiv -localeconv +;localeconv localtime log log10 @@ -485,7 +485,7 @@ rename rewind scanf setbuf -setlocale +;setlocale setvbuf signal sin diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile index 61485687f97..541be93995b 100644 --- a/reactos/lib/crtdll/makefile +++ b/reactos/lib/crtdll/makefile @@ -27,7 +27,7 @@ DIRECT_OBJECTS = direct/chdir.o direct/chdrive.o direct/getcwd.o direct/getdrive EXCEPT_OBJECTS = except/unwind.o except/abnorter.o except/exhand2.o except/matherr.o -LOCALE_OBJECTS = locale/locale.o +LOCALE_OBJECTS = # locale/locale.o MALLOC_OBJECTS = malloc/expand.o malloc/heap.o diff --git a/reactos/lib/crtdll/stdlib/ecvtbuf.c b/reactos/lib/crtdll/stdlib/ecvtbuf.c index 85520ebf0b1..724544133e5 100644 --- a/reactos/lib/crtdll/stdlib/ecvtbuf.c +++ b/reactos/lib/crtdll/stdlib/ecvtbuf.c @@ -3,7 +3,7 @@ #include #include #include -#include +// #include void __ecvround (char *, char *, const char *, int *); @@ -39,7 +39,7 @@ char * ecvtbuf (double value, int ndigits, int *decpt, int *sign, char *buf) { static char INFINITY[] = "Infinity"; - char decimal = localeconv()->decimal_point[0]; + char decimal = '.' /* localeconv()->decimal_point[0] */; char *cvtbuf = (char *)alloca (ndigits + 20); /* +3 for sign, dot, null; */ /* two extra for rounding */ /* 15 extra for alignment */ diff --git a/reactos/lib/crtdll/stdlib/fcvtbuf.c b/reactos/lib/crtdll/stdlib/fcvtbuf.c index df12c71cac9..c900fcad440 100644 --- a/reactos/lib/crtdll/stdlib/fcvtbuf.c +++ b/reactos/lib/crtdll/stdlib/fcvtbuf.c @@ -3,7 +3,7 @@ #include #include #include -#include +// #include void __ecvround (char *, char *, const char *, int *); @@ -11,7 +11,7 @@ char * fcvtbuf (double value, int ndigits, int *decpt, int *sign, char *buf) { static char INFINITY[] = "Infinity"; - char decimal = localeconv()->decimal_point[0]; + char decimal = '.' /* localeconv()->decimal_point[0] */; int digits = ndigits >= 0 ? ndigits : 0; char *cvtbuf = (char *)alloca (2*DBL_MAX_10_EXP + 16); char *s = cvtbuf;