more crt, crtdll and msvcrt cleanup Modified: trunk/reactos/lib/crt/conio/cgets.c Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cputs.c Modified: trunk/reactos/lib/crt/conio/getch.c Modified: trunk/reactos/lib/crt/conio/getche.c Modified: trunk/reactos/lib/crt/conio/kbhit.c Modified: trunk/reactos/lib/crt/conio/putch.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/float/isnan.c Modified: trunk/reactos/lib/crt/include/float.h Modified: trunk/reactos/lib/crt/include/internal/atexit.h Modified: trunk/reactos/lib/crt/include/internal/console.h Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/include/internal/math.h Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/math/hypot.c Modified: trunk/reactos/lib/crt/math/modf.c Modified: trunk/reactos/lib/crt/mbstring/mbscat.c Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_system.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/fgetchar.c Modified: trunk/reactos/lib/crt/stdio/gets.c Modified: trunk/reactos/lib/crt/stdio/perror.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Modified: trunk/reactos/lib/crt/stdlib/atexit.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/makepath.c Modified: trunk/reactos/lib/crt/stdlib/splitp.c Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c Modified: trunk/reactos/lib/crt/wine/heap.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/crtdll/precomp.h Modified: trunk/reactos/lib/msvcrt/dllmain.c Modified: trunk/reactos/lib/msvcrt/precomp.h Modified: trunk/reactos/lib/rtl/math.c _____
Modified: trunk/reactos/lib/crt/conio/cgets.c --- trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -6,8 +6,7 @@
* PROGRAMMER: Eric Kohl (Imported from DJGPP) */
-#include <conio.h> -#include <stdlib.h> +#include "precomp.h"
/* * @implemented _____
Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -8,8 +8,6 @@
#include "precomp.h"
-#include <conio.h> - /* * @unimplemented */ _____
Modified: trunk/reactos/lib/crt/conio/cputs.c --- trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@
*/
#include "precomp.h" -#include <conio.h>
/* * @implemented _____
Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@
*/
#include "precomp.h" -#include <conio.h> -#include <internal/console.h>
- /* * @implemented */ _____
Modified: trunk/reactos/lib/crt/conio/getche.c --- trunk/reactos/lib/crt/conio/getche.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getche.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,10 +10,8 @@
* 28/12/98: Created */
-#include <conio.h> -#include <internal/console.h> +#include "precomp.h"
- int _getche(void) { if (char_avail) _____
Modified: trunk/reactos/lib/crt/conio/kbhit.c --- trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@
*/
#include "precomp.h" -#include <conio.h> -#include <internal/console.h>
- /* * FIXME PeekConsoleInput returns more than keyboard hits * _____
Modified: trunk/reactos/lib/crt/conio/putch.c --- trunk/reactos/lib/crt/conio/putch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/putch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@
*/
#include "precomp.h" -#include <conio.h>
/* * @implemented _____
Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -12,11 +12,6 @@
#include "precomp.h"
-#include <conio.h> -#include <internal/console.h> - - - int char_avail = 0; int ungot_char = 0;
_____
Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,6 @@
#include "precomp.h" #include <direct.h> #include <stdlib.h> -#include <errno.h> #include <tchar.h>
/* _____
Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@
#include <direct.h> #include <internal/debug.h> #include <tchar.h> -#include <errno.h>
/* * @implemented _____
Modified: trunk/reactos/lib/crt/float/isnan.c --- trunk/reactos/lib/crt/float/isnan.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/float/isnan.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -16,9 +16,7 @@
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <math.h> -#include <float.h> -#include <internal/ieee.h> +#include "precomp.h"
/* _____
Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/float.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -91,9 +91,13 @@
#define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */
-#ifndef __GNUC__ -#define DBL_MAX_10_EXP 308 +#ifndef DBL_MAX_10_EXP +#define DBL_MAX_10_EXP 308 +#endif +#ifndef S_IFIFO #define S_IFIFO -1 +#endif +#ifndef UINT64_MAX #define UINT64_MAX 0xffffffffffffffff #endif
_____
Modified: trunk/reactos/lib/crt/include/internal/atexit.h --- trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,6 +2,9 @@
#ifndef __CRT_INTERNAL_ATEXIT_H #define __CRT_INTERNAL_ATEXIT_H
+#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif
struct __atexit { struct __atexit* __next; _____
Modified: trunk/reactos/lib/crt/include/internal/console.h --- trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@
#ifndef __CRT_INTERNAL_CONSOLE_H #define __CRT_INTERNAL_CONSOLE_H
+#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + extern int char_avail; extern int ungot_char;
_____
Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -136,13 +136,11 @@
#define MB_CUR_MAX __mb_cur_max
-int _isnanl(double x); -int _isinfl(double x); +int _isnanl(long double x); +int _isinfl(long double x); int _isnan(double x); int _isinf(double x);
- - /* Flags for the iobuf structure (for reference) */ #if 0 #define _IOREAD 1 /* currently reading */ @@ -150,24 +148,22 @@ #define _IORW 0x0080 /* opened as "r+w" */ #endif
+#ifndef W_OK +#define W_OK 2 /* Check for write permission */ +#endif + /* internal FILE->_flag flags */
#define _IOMYBUF 0x0008 /* stdio malloc()'d buffer */ #define _IOEOF 0x0010 /* EOF reached on read */ #define _IOERR 0x0020 /* I/O error from system */ #define _IOSTRG 0x0040 /* Strange or no file descriptor */ - #define _IOBINARY 0x040000 #define _IOTEXT 0x000000 - #define _IOCOMMIT 0x100000 - #define _IODIRTY 0x010000 #define _IOAHEAD 0x020000
- - - /* * The three possible buffering mode (nMode) values for setvbuf. * NOTE: _IOFBF works, but _IOLBF seems to work like unbuffered... @@ -176,12 +172,10 @@ #define _IOFBF 0x0000 /* full buffered */ #define _IOLBF 0x0040 /* line buffered */ #define _IONBF 0x0004 /* not buffered */ - #define _IO_LBF 0x80000 /* this value is used insteat of _IOLBF within the structure FILE as value for _flags, because _IOLBF has the same value as _IOSTRG */
- wint_t _filwbuf(FILE *f);
#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 @@ -189,6 +183,5 @@ int __cdecl _flsbuf (int, FILE*); #endif
- #endif /* __dj_include_libc_file_h__ */
_____
Modified: trunk/reactos/lib/crt/include/internal/math.h --- trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,9 @@
- #ifndef __CRT_INTERNAL_MATH_H #define __CRT_INTERNAL_MATH_H
+#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif
int _isinf (double); /* not exported */ int _isnanl (long double); /* not exported */ _____
Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@
#ifndef __CRT_INTERNAL_TLS_H #define __CRT_INTERNAL_TLS_H
+#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + #include <stdarg.h>
#include <windef.h> _____
Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/access.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,4 @@
#include "precomp.h" -#include <errno.h> #include <tchar.h>
#define NDEBUG _____
Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/open.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -42,7 +42,6 @@
#include <stdarg.h> #endif
-#include <fcntl.h> #include <sys/stat.h> #include <string.h> #include <share.h> _____
Modified: trunk/reactos/lib/crt/math/hypot.c --- trunk/reactos/lib/crt/math/hypot.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/hypot.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -17,10 +17,6 @@
*/ #include "precomp.h"
-#include <float.h> -#include <math.h> -#include <errno.h> - /* Approximate square roots of DBL_MAX and DBL_MIN. Numbers between these two shouldn't neither overflow nor underflow when squared. */ _____
Modified: trunk/reactos/lib/crt/math/modf.c --- trunk/reactos/lib/crt/math/modf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/modf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,12 +10,8 @@
* ==================================================== */
-#include <float.h> -#include <math.h> -#include <internal/ieee.h> -#include <internal/math.h> +#include "precomp.h"
- //static const double one = 1.0;
double modf(double __x, double *__i) _____
Modified: trunk/reactos/lib/crt/mbstring/mbscat.c --- trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@
+#include "precomp.h" #include <string.h>
/* _____
Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c --- trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@
+#include "precomp.h" #include <mbstring.h> #include <string.h>
_____
Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c --- trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,6 +9,7 @@
* 12/04/99: Created */
+#include "precomp.h" #include <mbstring.h> #include <stdlib.h>
_____
Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,13 +2,18 @@
#define _CRT_PRECOMP_H
/* Some global constants to hack around the msvc build */ +/* These will go away or be moved soon enough */ +#define _CRT_NON_CONFORMING_SWPRINTFS #define _CRT_SECURE_NO_DEPRECATE #define _INC_WTIME_INL #define _INC_UTIME_INL #define _INC_TIME_INL
/* Headers to be compiled */ +#include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <conio.h> #include <errno.h> #include <fcntl.h> #include <float.h> @@ -16,6 +21,9 @@ #include <math.h> #include <limits.h>
+#include <sys/stat.h> +#include <share.h> + /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> @@ -27,7 +35,10 @@ #endif
/* CRT Internal data */ +#include <internal/atexit.h> +#include <internal/console.h> #include <internal/file.h> #include <internal/ieee.h> +#include <internal/tls.h>
#endif /* _CRT_PRECOMP_H */ _____
Modified: trunk/reactos/lib/crt/process/_system.c --- trunk/reactos/lib/crt/process/_system.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/process/_system.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -13,7 +13,6 @@
#include <stdlib.h> #include <string.h> #include <process.h> -#include <errno.h>
/* * @implemented _____
Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/signal/signal.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@
#include <signal.h> #include <stdlib.h> -#include <errno.h> #include <string.h>
void _default_handler(int signal); _____
Modified: trunk/reactos/lib/crt/stdio/fgetchar.c --- trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -22,7 +22,6 @@
*/
#include "precomp.h" -#include <conio.h>
int _fgetchar(void) { _____
Modified: trunk/reactos/lib/crt/stdio/gets.c --- trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -83,9 +83,7 @@
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h> -#include <errno.h> -#include <string.h> +#include "precomp.h"
link_warning (gets, "the `gets' function is dangerous and should not be used.")
_____
Modified: trunk/reactos/lib/crt/stdio/perror.c --- trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,9 +1,6 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h"
-#include <errno.h> - - #ifdef perror #undef perror void perror(const char *s); _____
Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,12 +2,6 @@
#include "precomp.h"
-int _isnanl(double x); -int _isinfl(double x); -int _isnan(double x); -int _isinf(double x); - - int __vfwprintf(FILE *fp, const wchar_t *fmt0, va_list argp);
_____
Modified: trunk/reactos/lib/crt/stdlib/atexit.c --- trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,6 +1,5 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <internal/atexit.h> +#include "precomp.h"
void _atexit_cleanup(void) { _____
Modified: trunk/reactos/lib/crt/stdlib/errno.c --- trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,8 +2,6 @@
* */ #include "precomp.h" -#include <internal/tls.h> - #include "doserrmap.h"
/* _____
Modified: trunk/reactos/lib/crt/stdlib/makepath.c --- trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,6 @@
/* $Id$ */ +#include "precomp.h" #include <stdlib.h> #include <string.h>
_____
Modified: trunk/reactos/lib/crt/stdlib/splitp.c --- trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,8 +1,5 @@
-#include <stdlib.h> -#include <string.h> -#include <tchar.h> +#include "precomp.h"
- /* * @implemented */ _____
Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c --- trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,4 +2,6 @@
#define _UNICODE #define UNICODE
+#include <tchar.h> + #include "splitp.c" _____
Modified: trunk/reactos/lib/crt/wine/heap.c --- trunk/reactos/lib/crt/wine/heap.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/heap.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -23,7 +23,6 @@
#include "precomp.h"
-#include <errno.h> #include <malloc.h> #include <stdlib.h> #include <internal/mtdll.h> _____
Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -26,7 +26,6 @@
#include "precomp.h"
#include <wchar.h> -#include <conio.h> #include <ctype.h>
#define NDEBUG _____
Modified: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@
*/
#include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h> #include <sys/stat.h>
_____
Modified: trunk/reactos/lib/crtdll/precomp.h --- trunk/reactos/lib/crtdll/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@
+#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> #include <windows.h> +#include <internal/tls.h> +#include <stdlib.h> + +#endif /* _CRT_PRECOMP_H */ _____
Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@
*/
#include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h>
#define NDEBUG _____
Modified: trunk/reactos/lib/msvcrt/precomp.h --- trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@
+#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> +#include <internal/tls.h> +#include <stdlib.h> #include <windows.h> + +#endif /* _CRT_PRECOMP_H */ _____
Modified: trunk/reactos/lib/rtl/math.c --- trunk/reactos/lib/rtl/math.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/rtl/math.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -31,13 +31,13 @@
double atan (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fpatan" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
/* @@ -45,16 +45,16 @@ */ double ceil (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp;
__asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw));
- return __value; + return __val; }
/* @@ -62,12 +62,12 @@ */ double cos (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fcos" - : "=t" (__value): "0" (__x)); + : "=t" (__val): "0" (__x));
- return __value; + return __val; }
/* @@ -75,12 +75,12 @@ */ double fabs (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fabs" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
/* @@ -88,16 +88,16 @@ */ double floor (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp;
__asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw));
- return __value; + return __val; }
/* @@ -105,26 +105,26 @@ */ double log (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fldln2\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
double __log2 (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
/* @@ -132,7 +132,7 @@ */ double pow (double __x, double __y) { - register double __value, __exponent; + register double __val, __exponent; long __p = (long) __y;
if (__x == 0.0 && __y > 0.0) @@ -165,13 +165,13 @@ "fxch\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; + : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __val += 1.0; __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); + : "=t" (__val) : "0" (__val), "u" (__exponent));
- return __value; + return __val; }
/* @@ -179,12 +179,12 @@ */ double sin (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsin" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
/* @@ -192,12 +192,12 @@ */ double sqrt (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsqrt" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x));
- return __value; + return __val; }
/* @@ -205,11 +205,11 @@ */ double tan (double __x) { - register double __value; - register double __value2 __attribute__ ((unused)); + register double __val; + register double __val2 __attribute__ ((unused)); __asm __volatile__ ("fptan" - : "=t" (__value2), "=u" (__value) : "0" (__x)); + : "=t" (__val2), "=u" (__val) : "0" (__x));
- return __value; + return __val; }