Some cleanup of crt.a feel free to remove header duplication and use 'precomp.h' in more places to speed build times Modified: trunk/reactos/lib/crt/float/fpecode.c Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/stdio/fopen.c Modified: trunk/reactos/lib/crt/stdio/freopen.c Modified: trunk/reactos/lib/crt/stdio/fsopen.c Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/qsort.c Modified: trunk/reactos/lib/crt/stdlib/rand.c Modified: trunk/reactos/lib/crt/string/lasttok.c Modified: trunk/reactos/lib/crt/string/strtok.c _____
Modified: trunk/reactos/lib/crt/float/fpecode.c --- trunk/reactos/lib/crt/float/fpecode.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/float/fpecode.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,7 +1,3 @@
-#ifdef __USE_W32API -#undef __USE_W32API -#endif - #include <float.h> #include <internal/tls.h>
_____
Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-04-01 00:20:29 UTC (rev 14399) @@ -17,6 +17,9 @@
#include <fcntl.h> #include <stdarg.h>
+#include <windef.h> +#include <winbase.h> +#include <winnt.h>
#ifndef _IORMONCL #define _IORMONCL 004000 /* remove on close, for temp files */ @@ -50,9 +53,6 @@ void sigabort_handler(int sig); char split_oflags(int oflags);
- -#include <windows.h> - unsigned create_io_inherit_block(STARTUPINFOA* si); void UnixTimeToFileTime(time_t unix_time, FILETIME* filetime, DWORD remainder); time_t FileTimeToUnixTime(const FILETIME* filetime, DWORD *remainder); _____
Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/include/internal/tls.h 2005-04-01 00:20:29 UTC (rev 14399) @@ -3,7 +3,12 @@
#ifndef __CRT_INTERNAL_TLS_H #define __CRT_INTERNAL_TLS_H
-#include <windows.h> +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winnt.h> + #include <msvcrt/crttypes.h> #include <stddef.h>
_____
Modified: trunk/reactos/lib/crt/stdio/fopen.c --- trunk/reactos/lib/crt/stdio/fopen.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdio/fopen.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -25,6 +25,8 @@
*/ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
+#include "precomp.h" + #include <sys/types.h> #include <stdio.h> #include <string.h> _____
Modified: trunk/reactos/lib/crt/stdio/freopen.c --- trunk/reactos/lib/crt/stdio/freopen.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdio/freopen.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,5 +1,7 @@
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
+#include "precomp.h" + #include <sys/types.h> #include <stdio.h> #include <fcntl.h> _____
Modified: trunk/reactos/lib/crt/stdio/fsopen.c --- trunk/reactos/lib/crt/stdio/fsopen.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdio/fsopen.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -9,6 +9,8 @@
*/ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
+#include "precomp.h" + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> _____
Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -3,20 +3,11 @@
#include <stdio.h> #include <malloc.h> #include <internal/file.h> - -#ifdef __USE_W32API #include <ntdef.h> -#endif
- - extern int __mb_cur_max; - - - int __vfprintf(FILE*, const char*, va_list);
- /* * @implemented */ _____
Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,14 +1,13 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#ifdef __USE_W32API -#undef __USE_W32API -#endif +#include "precomp.h"
#include <stdarg.h> #include <stdio.h> #include <malloc.h> #include <internal/file.h>
+#include <ntdef.h>
int _isnanl(double x); int _isinfl(double x); _____
Modified: trunk/reactos/lib/crt/stdlib/errno.c --- trunk/reactos/lib/crt/stdlib/errno.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdlib/errno.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,9 +1,6 @@
/* $Id$ * */ -#ifdef __USE_W32API -#undef __USE_W32API -#endif
#include <errno.h> #include <internal/tls.h> _____
Modified: trunk/reactos/lib/crt/stdlib/qsort.c --- trunk/reactos/lib/crt/stdlib/qsort.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdlib/qsort.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,7 +1,4 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#ifdef __USE_W32API -#undef __USE_W32API -#endif
#include <stdlib.h> #include <search.h> _____
Modified: trunk/reactos/lib/crt/stdlib/rand.c --- trunk/reactos/lib/crt/stdlib/rand.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/stdlib/rand.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,7 +1,4 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#ifdef __USE_W32API -#undef __USE_W32API -#endif
#include <stdlib.h> #include <internal/tls.h> _____
Modified: trunk/reactos/lib/crt/string/lasttok.c --- trunk/reactos/lib/crt/string/lasttok.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/string/lasttok.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,7 +1,3 @@
-#ifdef __USE_W32API -#undef __USE_W32API -#endif - #include <internal/tls.h> #include <assert.h>
_____
Modified: trunk/reactos/lib/crt/string/strtok.c --- trunk/reactos/lib/crt/string/strtok.c 2005-04-01 00:17:10 UTC (rev 14398) +++ trunk/reactos/lib/crt/string/strtok.c 2005-04-01 00:20:29 UTC (rev 14399) @@ -1,7 +1,4 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#ifdef __USE_W32API -#undef __USE_W32API -#endif
#include <string.h> #include <internal/tls.h>