Skip to content

W
wine-cw
Commit f9128d79 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files
Options

No version of GNU C++ (unlike GNU C) supports unnamed structs.

parent b4488419
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 2 deletions
include/winnt.h
View file @ f9128d79
...@@ -235,8 +235,8 @@ ...@@ -235,8 +235,8 @@
# define NONAMELESSSTRUCT # define NONAMELESSSTRUCT
# define NONAMELESSUNION # define NONAMELESSUNION
#else #else
/* Anonymous struct support starts with gcc/g++ 2.96 */ /* Anonymous struct support starts with gcc 2.96 */
# if !defined(NONAMELESSSTRUCT) && (defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ < 96)))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) # if !defined(NONAMELESSSTRUCT) && (defined(__GNUC__) && (defined(__cplusplus) || ((__GNUC__ < 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ < 96))))) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define NONAMELESSSTRUCT # define NONAMELESSSTRUCT
# endif # endif
/* Anonymous unions support starts with gcc 2.96/g++ 2.95 */ /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
......
include/winuser.h
View file @ f9128d79
...@@ -2385,17 +2385,31 @@ typedef struct tagMONITORINFO ...@@ -2385,17 +2385,31 @@ typedef struct tagMONITORINFO
DWORD dwFlags; DWORD dwFlags;
} MONITORINFO, *LPMONITORINFO; } MONITORINFO, *LPMONITORINFO;
#ifdef __cplusplus
typedef struct tagMONITORINFOEXA : public tagMONITORINFO
{
CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXA, *LPMONITORINFOEXA;
#else
typedef struct tagMONITORINFOEXA typedef struct tagMONITORINFOEXA
{ {
MONITORINFO DUMMYSTRUCTNAME; MONITORINFO DUMMYSTRUCTNAME;
CHAR szDevice[CCHDEVICENAME]; CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXA, *LPMONITORINFOEXA; } MONITORINFOEXA, *LPMONITORINFOEXA;
#endif
#ifdef __cplusplus
typedef struct tagMONITORINFOEXW : public tagMONITORINFO
{
WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW, *LPMONITORINFOEXW;
#else
typedef struct tagMONITORINFOEXW typedef struct tagMONITORINFOEXW
{ {
MONITORINFO DUMMYSTRUCTNAME; MONITORINFO DUMMYSTRUCTNAME;
WCHAR szDevice[CCHDEVICENAME]; WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEXW, *LPMONITORINFOEXW; } MONITORINFOEXW, *LPMONITORINFOEXW;
#endif
DECL_WINELIB_TYPE_AW(MONITORINFOEX) DECL_WINELIB_TYPE_AW(MONITORINFOEX)
DECL_WINELIB_TYPE_AW(LPMONITORINFOEX) DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)
......
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