Synch recent 3.4.2 changes to main trunk
This is merely a synchronization of recent changes for the Macintosh Carbon port, which were committed to the 3.4.2 branch, to the main trunk.
This commit is contained in:
@@ -44,7 +44,9 @@
|
||||
#undef red /* undef internal color const strings from decl */
|
||||
#undef green
|
||||
#undef blue
|
||||
#include <windows.h>
|
||||
#if !TARGET_API_MAC_CARBON
|
||||
# include <windows.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Error code returned when it's probably our fault, or
|
||||
|
||||
Reference in New Issue
Block a user