Changeset 22121 for branches/swt/include/win/windef.h

Timestamp:

Feb 14, 2016, 2:28:41 PM (10 years ago)

Author:

rousseau

Message:

Odin modifications needed for 'gdiplus' [odin]

Modifications:
o dcdata.h

Use 'typedef' for the enum so its more compatible with plain C.

o gdiplus.h

Disabling the namespaces is a quick-hack to get 'gdiplus.dll' to
build. A more proper fix would probably be using '-xc' for g++
when building the 'gdiplus' module.

o gdiplusflat.h

Temporarily remove the majority of prototypes so yet undefined types
do not get introduced already.

o gdiplusimaging.h

Possibly revert this mod after it is clear how to properly handle the
namespaces in 'gdiplus.h'.

o shtypes.h

Includes 'wtypes.h' which defines 'PROPID'.

o windef.h

Not sure why these 'IN','OUT','...' definitions only got defined when
WINE was *not* defined.

o winnt.h

Park Wine macros here for now. Proper include ordering needs to be
revisited anyway.

Note:
The headers for GDI+ headers were already added in rev. #22082 to
satisfy building 'swt.dll'. They also came from the wine-repo.

File:

• branches/swt/include/win/windef.h (modified) (2 diffs)

branches/swt/include/win/windef.h

@@ -657 +657 @@
 
 /* Define some empty macros for compatibility with Windows code. */
-
-#ifndef __WINE__
+// rousseau.201602131406
+// Why is this in a __WINE__ ifndef ?
+// Macro __WINE__ is defined when compiling gdi32 and thus gdiplus, and
+// gdiplus uses the 'IN' and 'OUT' stuff.
+// Disabled ifndef for now.
+///#ifndef __WINE__
 #define NEAR
 #define FAR
@@ -668 +672 @@
 #define OUT
 #define OPTIONAL
-#endif  /* __WINE__ */
+///#endif  /* __WINE__ */
 
 /* Macro for structure packing. */