update for HEAD-2003091401

[reactos.git] / include / napi / shared_data.h

diff --git a/include/napi/shared_data.h b/include/napi/shared_data.h
index 2387273..2893d15 100644 (file)
--- a/include/napi/shared_data.h
+++ b/include/napi/shared_data.h
@@ -15,9 +15,9 @@ typedef struct _KUSER_SHARED_DATA
 {
    volatile ULONG TickCountLow;
    ULONG TickCountMultiplier;
-   volatile KSYSTEM_TIME InterruptTime;
-   volatile KSYSTEM_TIME SystemTime;
-   volatile KSYSTEM_TIME TimeZoneBias;
+   volatile ULARGE_INTEGER InterruptTime;
+   volatile ULARGE_INTEGER SystemTime;
+   volatile ULARGE_INTEGER TimeZoneBias;
    USHORT ImageNumberLow;
    USHORT ImageNumberHigh;
    WCHAR NtSystemRoot[260];
@@ -31,7 +31,7 @@ typedef struct _KUSER_SHARED_DATA
    ULONG NtMinorVersion;
    BOOLEAN ProcessorFeatures[PROCESSOR_FEATURES_MAX];
 
-   // NT5 / Win2k specific ??
+   /* NT5 / Win2k specific ?? */
    ULONG Reserved1;
    ULONG Reserved3;
    volatile ULONG TimeSlip;
@@ -58,10 +58,17 @@ typedef struct _KUSER_SHARED_DATA
 #define USER_SHARED_DATA       (0x7FFE0000)
 
 #if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__)
-#define KI_USER_SHARED_DATA    (0xFFDF0000)
+#ifndef __USE_W32API
+#define KI_USER_SHARED_DATA (0xFFDF0000)
+#endif
+#ifdef SharedUserData
+#undef SharedUserData
+#endif
 #define SharedUserData         ((KUSER_SHARED_DATA * const)KI_USER_SHARED_DATA)
 #else
+#ifndef __USE_W32API
 #define SharedUserData         ((KUSER_SHARED_DATA * const)USER_SHARED_DATA)
+#endif /* !__USE_W32API */
 #endif