summaryrefslogtreecommitdiffstats
path: root/winsup/w32api/include/windows.h
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/w32api/include/windows.h')
-rw-r--r--winsup/w32api/include/windows.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index dde83a316..97e037e90 100644
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -106,11 +106,14 @@
#endif /* (_WIN32_WINNT >= 0x0400) */
#endif
#ifndef NOGDI
-#if !defined (__OBJC__)
+/* In older versions we disallowed COM declarations in __OBJC__
+ because of conflicts with @interface directive. Define _OBJC_NO_COM
+ to keep this behaviour. */
+#if !defined (_OBJC_NO_COM)
#if (__GNUC__ >= 3) || defined (__WATCOMC__)
#include <ole2.h>
#endif
-#endif /* __OBJC__ */
+#endif /* _OBJC_NO_COM */
#endif
#endif /* WIN32_LEAN_AND_MEAN */