From d470f18cfbc9e969ace2a3aec278a5762486f016 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Mon, 10 Feb 2003 23:18:41 +0000
Subject: [PATCH] sorry Casper, I have to insist: OSVERSIONINFOEX *derives*
 from OSVERSIONINFO. It's not just a matter of field names and types, it's a
 type-checking issue. At least for C++, it has to be inheritance. For C, it's
 temporarily commented out, until there's a macro to specify if the compiler
 supports unnamed structure members

svn path=/trunk/; revision=4136
---
 reactos/include/structs.h | 60 +++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index d7c5de3a3cd..b70f071a501 100644
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -2923,33 +2923,49 @@ typedef OSVERSIONINFOW OSVERSIONINFO;
 #endif
 
 typedef struct _OSVERSIONINFOEXA
+#if defined(__cplusplus)
+: public OSVERSIONINFOA
 {
-  DWORD dwOSVersionInfoSize;
-  DWORD dwMajorVersion;
-  DWORD dwMinorVersion;
-  DWORD dwBuildNumber;
-  DWORD dwPlatformId;
-  CHAR szCSDVersion[ 128 ];
-  WORD wServicePackMajor;
-  WORD wServicePackMinor;
-  WORD wSuiteMask;
-  BYTE wProductType;
-  BYTE wReserved;
+#elif 0
+{
+ OSVERSIONINFOA;
+#else
+{
+ DWORD dwOSVersionInfoSize;
+ DWORD dwMajorVersion;
+ DWORD dwMinorVersion;
+ DWORD dwBuildNumber;
+ DWORD dwPlatformId;
+ CHAR szCSDVersion[ 128 ];
+#endif
+ WORD wServicePackMajor;
+ WORD wServicePackMinor;
+ WORD wSuiteMask;
+ BYTE wProductType;
+ BYTE wReserved;
 } OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
 
 typedef struct _OSVERSIONINFOEXW
+#if defined(__cplusplus)
+: public OSVERSIONINFOW
 {
-  DWORD dwOSVersionInfoSize;
-  DWORD dwMajorVersion;
-  DWORD dwMinorVersion;
-  DWORD dwBuildNumber;
-  DWORD dwPlatformId;
-  WCHAR szCSDVersion[ 128 ];
-  WORD wServicePackMajor;
-  WORD wServicePackMinor;
-  WORD wSuiteMask;
-  BYTE wProductType;
-  BYTE wReserved;
+#elif 0
+{
+ OSVERSIONINFOW;
+#else
+{
+ DWORD dwOSVersionInfoSize;
+ DWORD dwMajorVersion;
+ DWORD dwMinorVersion;
+ DWORD dwBuildNumber;
+ DWORD dwPlatformId;
+ WCHAR szCSDVersion[ 128 ];
+#endif
+ WORD wServicePackMajor;
+ WORD wServicePackMinor;
+ WORD wSuiteMask;
+ BYTE wProductType;
+ BYTE wReserved;
 } OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
 
 #ifdef UNICODE