From cb784c89505c6f45ec0a90a6d6e84ee6f4c76aaf Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos <dimitri_at@users.sf.net>
Date: Wed, 19 Apr 2006 08:40:53 +0000
Subject: 	* include/winnt.h, include/ddk/winddk.h (FIELD_OFFSET): 
 Compile with recent C++ compiler such as gcc 3.4. 	*
 include/ddk/winddk.h: Ditto.

---
 winsup/w32api/include/ddk/winddk.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'winsup/w32api/include/ddk/winddk.h')

diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index 123a44a73..c9dabbb52 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -3967,9 +3967,14 @@ KefReleaseSpinLockFromDpcLevel(
  *   IN PCHAR  Field);
  */
 #ifndef FIELD_OFFSET
+#ifdef __cplusplus
+#define FIELD_OFFSET(Type, Field) (reinterpret_cast<LONG> \
+  (&reinterpret_cast<char&>(static_cast<Type *>(0)->Field)))
+#else
 #define FIELD_OFFSET(Type, Field) \
   ((LONG) (&(((Type *) 0)->Field)))
 #endif
+#endif
 
 /*
  * PVOID
-- 
cgit v1.2.3