commit 347081d532ef7df5f42debd686daff776dbf3bf2
author Jon Griffiths <jon_p_griffiths@yahoo.com> Thu Apr 15 04:59:22 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 15 04:59:22 2004 +0000
tree a551fac41da52db5a8fa8c41e9d1028d11aaa361
parent 5b338a87d8b4e5b01fc67356049f20bcecc6355f

Prevent CY type from being redefined.

include/wtypes.h

diff --git a/include/wtypes.h b/include/wtypes.h
index 8d07292..8096615 100644
--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -617,6 +617,8 @@
 } CY;
 
 #else
+#ifndef _tagCY_DEFINED
+#define _tagCY_DEFINED
 typedef union tagCY {
     struct {
 #ifdef WORDS_BIGENDIAN
@@ -630,6 +632,7 @@
     LONGLONG int64;
 } CY;
 #endif
+#endif
 typedef CY *LPCY;
 
 #if 0

include/wtypes.idl

diff --git a/include/wtypes.idl b/include/wtypes.idl
index 2e05d6c..d51467d 100644
--- a/include/wtypes.idl
+++ b/include/wtypes.idl
@@ -570,6 +570,8 @@
   LONGLONG int64;
 } CY;
 cpp_quote("#else") /* C/C++ defs */
+cpp_quote("#ifndef _tagCY_DEFINED")
+cpp_quote("#define _tagCY_DEFINED")
 cpp_quote("typedef union tagCY {")
 cpp_quote("    struct {")
 cpp_quote("#ifdef WORDS_BIGENDIAN")
@@ -583,6 +585,7 @@
 cpp_quote("    LONGLONG int64;")
 cpp_quote("} CY;")
 cpp_quote("#endif")
+cpp_quote("#endif")
 
 typedef CY *LPCY;