- copy.c, view.c: malloc.h now properly implements alloca/_alloca, so remove #ifdef...

- main.c: Change bogus #ifdef _MSC_VER to #if 0 -- it seems this is another instance of "MSVC = MS' headers". The code compiles fine with our headers now and should probably be enabled.
- debug.h: Define non-NDEBUG DPRINT the same way for GCC and MSVC. The MSVC version was never inlined because the function has a variable argument list. The GCC version works fine under MSVC so use it instead. Results in neater code in object files.

svn path=/trunk/; revision=42884

diff --git a/reactos/drivers/network/tcpip/tcpip/main.c b/reactos/drivers/network/tcpip/tcpip/main.c
index 6f88200..9d6fc73 100644 (file)
--- a/reactos/drivers/network/tcpip/tcpip/main.c
+++ b/reactos/drivers/network/tcpip/tcpip/main.c
@@ -48,7 +48,7 @@ VOID TiWriteErrorLog(
  *     DumpData         = Pointer to dump data for the log entry
  */
 {
-#ifdef _MSC_VER
+#if 0
     PIO_ERROR_LOG_PACKET LogEntry;
     UCHAR EntrySize;
     ULONG StringSize;
@@ -481,7 +481,7 @@ TiDispatch(
 
   Irp->IoStatus.Information = 0;
 
-#ifdef _MSC_VER
+#if 0
   Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp);
   if (NT_SUCCESS(Status)) {
     TiDispatchInternal(DeviceObject, Irp);

diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h
index 3575585..bb94d9f 100644 (file)
--- a/reactos/include/reactos/debug.h
+++ b/reactos/include/reactos/debug.h
@@ -90,14 +90,9 @@ RtlAssert(
         #define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
 
     #else
-        #ifdef _MSC_VER
-            static __inline void DPRINT ( const char* fmt, ... )
-            {
-                UNREFERENCED_PARAMETER(fmt);
-            }
-        #else
-            #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
-        #endif
+
+        #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+
     #endif
 
     #define UNIMPLEMENTED       DbgPrint("WARNING:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__);

diff --git a/reactos/ntoskrnl/cc/copy.c b/reactos/ntoskrnl/cc/copy.c
index 723254a..439eb89 100644 (file)
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@@ -20,15 +20,6 @@ static PFN_TYPE CcZeroPage = 0;
 #define MAX_ZERO_LENGTH        (256 * 1024)
 #define MAX_RW_LENGTH  (256 * 1024)
 
-#if defined(__GNUC__)
-/* void * alloca(size_t size); */
-#elif defined(_MSC_VER)
-void* _alloca(size_t size);
-#define alloca _alloca
-#else
-#error Unknown compiler for alloca intrinsic stack allocation "function"
-#endif
-
 ULONG CcFastMdlReadWait;
 ULONG CcFastMdlReadNotPossible;
 ULONG CcFastReadNotPossible;
@@ -73,7 +64,7 @@ ReadCacheSegmentChain(PBCB Bcb, ULONG ReadOffset, ULONG Length,
   KEVENT Event;
   PMDL Mdl;
 
-  Mdl = alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH));
+  Mdl = _alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH));
 
   Status = CcRosGetCacheSegmentChain(Bcb, ReadOffset, Length, &head);
   if (!NT_SUCCESS(Status))
@@ -205,7 +196,7 @@ ReadCacheSegment(PCACHE_SEGMENT CacheSeg)
     {
       Size = CacheSeg->Bcb->CacheSegmentSize;
     }
-  Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size));
+  Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size));
   MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size);
   MmBuildMdlForNonPagedPool(Mdl);
   Mdl->MdlFlags |= MDL_IO_PAGE_READ;
@@ -259,7 +250,7 @@ WriteCacheSegment(PCACHE_SEGMENT CacheSeg)
             MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT)));
         } while (++i < (Size >> PAGE_SHIFT));
     }
-  Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size));
+  Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size));
   MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size);
   MmBuildMdlForNonPagedPool(Mdl);
   Mdl->MdlFlags |= MDL_IO_PAGE_READ;
@@ -612,7 +603,7 @@ CcZeroData (IN PFILE_OBJECT     FileObject,
     {
       /* File is not cached */
 
-      Mdl = alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH));
+      Mdl = _alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH));
 
       while (Length > 0)
        {

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index a9abfc5..a19171c 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -70,15 +70,6 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList;
 static NPAGED_LOOKASIDE_LIST BcbLookasideList;
 static NPAGED_LOOKASIDE_LIST CacheSegLookasideList;
 
-
-#if defined(__GNUC__)
-/* void * alloca(size_t size); */
-#elif defined(_MSC_VER)
-void* _alloca(size_t size);
-#else
-#error Unknown compiler for alloca intrinsic stack allocation "function"
-#endif
-
 #if DBG || defined(KDBG)
 static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line )
 {
@@ -737,15 +728,8 @@ CcRosGetCacheSegmentChain(PBCB Bcb,
 
   Length = ROUND_UP(Length, Bcb->CacheSegmentSize);
 
-#if defined(__GNUC__)
-  CacheSegList = alloca(sizeof(PCACHE_SEGMENT) *
-                       (Length / Bcb->CacheSegmentSize));
-#elif defined(_MSC_VER)
   CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) *
                        (Length / Bcb->CacheSegmentSize));
-#else
-#error Unknown compiler for alloca intrinsic stack allocation "function"
-#endif
 
   /*
    * Look for a cache segment already mapping the same data.