[ros-diffs] [peterw] 25276: - Add the rtltypes.h change from r25264 back and add the define for HEAP_CREATE_ENABLE_EXECUTE to winnt.h, this, I believe, is the proper fix.

Author: peterw
Date: Tue Jan  2 13:25:51 2007
New Revision: 25276

URL: http://svn.reactos.org/svn/reactos?rev=25276&view=rev
Log:
- Add the rtltypes.h change from r25264 back and add the define for
HEAP_CREATE_ENABLE_EXECUTE to winnt.h, this, I believe, is the proper fix.

Modified:
    trunk/reactos/include/ndk/rtltypes.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/ndk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtltypes.h (original)
+++ trunk/reactos/include/ndk/rtltypes.h Tue Jan  2 13:25:51 2007
@@ -138,7 +138,7 @@
      HEAP_CREATE_ALIGN_16           |                       \
      HEAP_CREATE_ENABLE_TRACING     |                       \
      HEAP_CREATE_ENABLE_EXECUTE)
-#ifndef __GNUC__
+#ifdef C_ASSERT
 C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF);
 #endif
 

Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h (original)
+++ trunk/reactos/include/psdk/winnt.h Tue Jan  2 13:25:51 2007
@@ -963,6 +963,7 @@
 #define HEAP_DISABLE_COALESCE_ON_FREE 128
 #define HEAP_CREATE_ALIGN_16 0x10000
 #define HEAP_CREATE_ENABLE_TRACING 0x20000
+#define HEAP_CREATE_ENABLE_EXECUTE 0x00040000
 #define HEAP_MAXIMUM_TAG 0xFFF
 #define HEAP_PSEUDO_TAG_FLAG 0x8000
 #define HEAP_TAG_SHIFT 16