Skip to content

W
wine-cw
Commit 347081d5 authored by Jon Griffiths's avatar Jon Griffiths Committed by Alexandre Julliard
Browse files
Options

Prevent CY type from being redefined.

parent 5b338a87
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
include/wtypes.h
View file @ 347081d5
...@@ -617,6 +617,8 @@ typedef struct tagCY { ...@@ -617,6 +617,8 @@ typedef struct tagCY {
} CY; } CY;
#else #else
#ifndef _tagCY_DEFINED
#define _tagCY_DEFINED
typedef union tagCY { typedef union tagCY {
struct { struct {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
...@@ -630,6 +632,7 @@ typedef union tagCY { ...@@ -630,6 +632,7 @@ typedef union tagCY {
LONGLONG int64; LONGLONG int64;
} CY; } CY;
#endif #endif
#endif
typedef CY *LPCY; typedef CY *LPCY;
#if 0 #if 0
......
include/wtypes.idl
View file @ 347081d5
...@@ -570,6 +570,8 @@ typedef struct tagCY { ...@@ -570,6 +570,8 @@ typedef struct tagCY {
LONGLONG int64; LONGLONG int64;
} CY; } CY;
cpp_quote("#else") /* C/C++ defs */ cpp_quote("#else") /* C/C++ defs */
cpp_quote("#ifndef _tagCY_DEFINED")
cpp_quote("#define _tagCY_DEFINED")
cpp_quote("typedef union tagCY {") cpp_quote("typedef union tagCY {")
cpp_quote(" struct {") cpp_quote(" struct {")
cpp_quote("#ifdef WORDS_BIGENDIAN") cpp_quote("#ifdef WORDS_BIGENDIAN")
...@@ -583,6 +585,7 @@ cpp_quote(" } DUMMYSTRUCTNAME;") ...@@ -583,6 +585,7 @@ cpp_quote(" } DUMMYSTRUCTNAME;")
cpp_quote(" LONGLONG int64;") cpp_quote(" LONGLONG int64;")
cpp_quote("} CY;") cpp_quote("} CY;")
cpp_quote("#endif") cpp_quote("#endif")
cpp_quote("#endif")
typedef CY *LPCY; typedef CY *LPCY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment