[ion] 24416: - Guard some current cmlib includes against new cm branch - Remove NTSYSAPI from NtBuildNumber definition in NDK.

Author: ion
Date: Fri Oct  6 03:01:38 2006
New Revision: 24416

URL: http://svn.reactos.org/svn/reactos?rev=24416&view=rev
Log:
- Guard some current cmlib includes against new cm branch
- Remove NTSYSAPI from NtBuildNumber definition in NDK.

Modified:
    trunk/reactos/include/ndk/extypes.h
    trunk/reactos/lib/cmlib/cmdata.h
    trunk/reactos/lib/cmlib/cmlib.h

Modified: trunk/reactos/include/ndk/extypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=2...
==============================================================================
--- trunk/reactos/include/ndk/extypes.h (original)
+++ trunk/reactos/include/ndk/extypes.h Fri Oct  6 03:01:38 2006
@@ -63,7 +63,7 @@
 //
 // Exported NT Build Number
 //
-extern ULONG NTSYSAPI NtBuildNumber;
+extern ULONG NtBuildNumber;

//
 // Invalid Handle Value Constant

Modified: trunk/reactos/lib/cmlib/cmdata.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=2441...
==============================================================================
--- trunk/reactos/lib/cmlib/cmdata.h (original)
+++ trunk/reactos/lib/cmlib/cmdata.h Fri Oct  6 03:01:38 2006
@@ -17,6 +17,8 @@
 #define  REG_HASH_TABLE_CELL_ID        0x666c
 #define  REG_VALUE_CELL_ID             0x6b76
 #define  REG_SECURITY_CELL_ID          0x6b73
+
+#ifndef _CM_

#include <pshpack1.h>

@@ -147,4 +149,6 @@

#include <poppack.h>

+#endif
+
 #endif /* CMLIB_CMDATA_H */

Modified: trunk/reactos/lib/cmlib/cmlib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=24416...
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h (original)
+++ trunk/reactos/lib/cmlib/cmlib.h Fri Oct  6 03:01:38 2006
@@ -64,7 +64,7 @@
 {
     ULONG_PTR Bin;
     ULONG_PTR Block;
-    PCM_VIEW_OF_FILE CmHive;
+    struct _CM_VIEW_OF_FILE *CmHive;
     ULONG MemAlloc;
 } HMAP_ENTRY, *PHMAP_ENTRY;

@@ -118,6 +118,7 @@
     DUAL Storage[HvMaxStorageType];
 } HHIVE, *PHHIVE;

+#ifndef _CM_
 typedef struct _EREGISTRY_HIVE
 {
   HHIVE Hive;
@@ -129,6 +130,7 @@
   HANDLE  HiveHandle;
   HANDLE  LogHandle;
 } EREGISTRY_HIVE, *PEREGISTRY_HIVE;
+#endif

/*
  * Public functions.