[ros-diffs] [ion] 15138: Fix some CRT includes to make it build

Fix some CRT includes to make it build
Modified: branches/new_headers/reactos/lib/crt/except/exhand2.c
Modified: branches/new_headers/reactos/lib/crt/except/matherr.c
Modified: branches/new_headers/reactos/lib/crt/except/unwind.c
Modified: branches/new_headers/reactos/lib/crt/include/internal/debug.h
Modified: branches/new_headers/reactos/lib/crt/include/internal/tls.h
Modified: branches/new_headers/reactos/lib/crt/stdio/vfwprint.c
Modified: branches/new_headers/reactos/lib/crt/stdlib/rand.c
Modified: branches/new_headers/reactos/lib/crt/wine/heap.c
Modified: branches/new_headers/reactos/lib/crt/wine/scanf.c
Modified: branches/new_headers/reactos/lib/crt/wine/thread.c
Modified: branches/new_headers/reactos/lib/tgetopt/getopt.c
  _____  

Modified: branches/new_headers/reactos/lib/crt/except/exhand2.c
--- branches/new_headers/reactos/lib/crt/except/exhand2.c
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/except/exhand2.c
2005-05-08 17:35:17 UTC (rev 15138)
@@ -1,5 +1,6 @@

 #include "precomp.h"
-#include <excpt.h>
+#include <ndk/umtypes.h>
+#include <ndk/rtltypes.h>
 
 #ifdef __GNUC__
 #else
  _____  

Modified: branches/new_headers/reactos/lib/crt/except/matherr.c
--- branches/new_headers/reactos/lib/crt/except/matherr.c
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/except/matherr.c
2005-05-08 17:35:17 UTC (rev 15138)
@@ -1,6 +1,5 @@

 #include "precomp.h"
 #include <math.h>
-#include <ntos/except.h>
 
 
 int _matherr(struct _exception* e)
  _____  

Modified: branches/new_headers/reactos/lib/crt/except/unwind.c
--- branches/new_headers/reactos/lib/crt/except/unwind.c
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/except/unwind.c
2005-05-08 17:35:17 UTC (rev 15138)
@@ -1,6 +1,7 @@

 #include "precomp.h"
-#include <excpt.h>
-#include <wine/winternl.h>
+#include <ndk/umtypes.h>
+#include <ndk/rtltypes.h>
+#include <ndk/rtlfuncs.h>
 
 /*
  * @implemented
  _____  

Modified: branches/new_headers/reactos/lib/crt/include/internal/debug.h
--- branches/new_headers/reactos/lib/crt/include/internal/debug.h
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/include/internal/debug.h
2005-05-08 17:35:17 UTC (rev 15138)
@@ -75,12 +75,6 @@

 #endif
 
 
-/* ULONG CDECL DbgPrint(PCH Format, ...); */
-ULONG DbgPrint(PCH Format,...);
-/* unsigned long DbgPrint(const char* Format, ...); */
-
-
-
 /* #define TRACE 0 ? (void)0 : Trace */
 
 /* void Trace(TCHAR* lpszFormat, ...); */
  _____  

Modified: branches/new_headers/reactos/lib/crt/include/internal/tls.h
--- branches/new_headers/reactos/lib/crt/include/internal/tls.h
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/include/internal/tls.h
2005-05-08 17:35:17 UTC (rev 15138)
@@ -9,14 +9,13 @@

 #include <winbase.h>
 #include <winnt.h>
 
-#include <msvcrt/crttypes.h>
 #include <stddef.h>
 
 typedef struct _ThreadData
 {
   int terrno;                   /* *nix error code */
   unsigned long tdoserrno;      /* Win32 error code (for I/O only) */
-  unsigned LONGLONG tnext;      /* used by rand/srand */
+  unsigned long long tnext;     /* used by rand/srand */
 
   char *lasttoken;              /* used by strtok */
   wchar_t *wlasttoken;          /* used by wcstok */
  _____  

Modified: branches/new_headers/reactos/lib/crt/stdio/vfwprint.c
--- branches/new_headers/reactos/lib/crt/stdio/vfwprint.c
2005-05-08 17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/stdio/vfwprint.c
2005-05-08 17:35:17 UTC (rev 15138)
@@ -7,8 +7,9 @@

 #include <malloc.h>
 #include <internal/file.h>
 
-#include <ntdef.h>
+#include <ndk/umtypes.h>
 
+
 int _isnanl(double x);
 int _isinfl(double x);
 int _isnan(double x);
  _____  

Modified: branches/new_headers/reactos/lib/crt/stdlib/rand.c
--- branches/new_headers/reactos/lib/crt/stdlib/rand.c	2005-05-08
17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/stdlib/rand.c	2005-05-08
17:35:17 UTC (rev 15138)
@@ -11,11 +11,7 @@

 {
   PTHREADDATA ThreadData = GetThreadData();
 
-#ifdef HAVE_LONGLONG
   ThreadData->tnext = ThreadData->tnext * 0x5deece66dLL + 11;
-#else
-  ThreadData->tnext = ThreadData->tnext * 0x5deece66dL + 11;
-#endif
   return (int)((ThreadData->tnext >> 16) & RAND_MAX);
 }
 
  _____  

Modified: branches/new_headers/reactos/lib/crt/wine/heap.c
--- branches/new_headers/reactos/lib/crt/wine/heap.c	2005-05-08
17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/wine/heap.c	2005-05-08
17:35:17 UTC (rev 15138)
@@ -28,9 +28,11 @@

 #include <stdlib.h>
 #include <internal/mtdll.h>
 
-#include "wine/debug.h"
+#define NDEBUG
+#include <internal/debug.h>
+//#include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+//WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* MT */
 #define LOCK_HEAP   _mlock( _HEAP_LOCK )
  _____  

Modified: branches/new_headers/reactos/lib/crt/wine/scanf.c
--- branches/new_headers/reactos/lib/crt/wine/scanf.c	2005-05-08
17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/wine/scanf.c	2005-05-08
17:35:17 UTC (rev 15138)
@@ -23,44 +23,19 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
  
- 
-/*
 #include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "msvcrt.h"
-*/
-
-//#include <ntdll/ntdll.h>
-#include <ntdll/rtl.h>
-//#include <ddk/ntddk.h>
-//#include <ntos/heap.h>
-#include <stdarg.h>
 #include <wchar.h>
 #include <stdio.h>
 #include <conio.h>
 #include <ctype.h>
 #include <internal/file.h>
 
-//#include <ntos/heap.h>
+#include <ndk/umtypes.h>
+#include <ndk/rtlfuncs.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 
-
-/*
-This is so ugly. I tried including anything/everything, but no matter
-what i did i got complaints about RtlGetProcessHeap etc. being
undefined.
--Gunnar (i hate headers)
-*/
-#define RtlFreeHeap HeapFree
-#define RtlAllocateHeap HeapAlloc
-#define RtlGetProcessHeap GetProcessHeap
-//#include "wine/debug.h"
-
 #define WARN DPRINT1
 
 //WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
  _____  

Modified: branches/new_headers/reactos/lib/crt/wine/thread.c
--- branches/new_headers/reactos/lib/crt/wine/thread.c	2005-05-08
17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/crt/wine/thread.c	2005-05-08
17:35:17 UTC (rev 15138)
@@ -24,9 +24,11 @@

 #include <malloc.h>
 #include <process.h>
 
-#include "wine/debug.h"
+#define NDEBUG
+#include <internal/debug.h>
+//#include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+//WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 void _amsg_exit (int errnum);
 /* Index to TLS */
  _____  

Modified: branches/new_headers/reactos/lib/tgetopt/getopt.c
--- branches/new_headers/reactos/lib/tgetopt/getopt.c	2005-05-08
17:34:37 UTC (rev 15137)
+++ branches/new_headers/reactos/lib/tgetopt/getopt.c	2005-05-08
17:35:17 UTC (rev 15138)
@@ -11,8 +11,6 @@

 #include <string.h>
 #include <stdio.h>
 
-#include "tgetopt.h"
-
 int _topterr = 1;
 int _toptind = 1;
 int _toptopt;