Changeset 5925

Timestamp:

Jun 7, 2001, 2:46:40 PM (25 years ago)

Author:

sandervl

Message:

compile fix for vac 3.6.5

Location:

trunk

Files:

• include/odin.h (modified) (1 diff)
• src/ole32/ole32.h (modified) (2 diffs)

trunk/include/odin.h

@@ -89 +89 @@
 
 #ifndef RC_INVOKED
-  #if (__IBMC__ == 300)
+  //Nameless unions or structures are not supported in C mode
+  //(nameless unions only in CPP mode and nameless unions only in VAC 3.6.5 CPP mode)
+  #ifdef __IBMC__
   #define NONAMELESSUNION
+  #define NONAMELESSSTRUCT
   #endif
-  #if (__IBMCPP__ == 300) | (__IBMC__ == 300)
+  #if (__IBMCPP__ == 300)
   #define NONAMELESSSTRUCT
   #endif

trunk/src/ole32/ole32.h

@@ -1 @@
-/* $Id: ole32.h,v 1.16 2001-06-06 17:17:21 bird Exp $ */
+/* $Id: ole32.h,v 1.17 2001-06-07 12:46:40 sandervl Exp $ */
 /*
  *
@@ -14 +14 @@
 #ifndef __OLE32_H__
 #define __OLE32_H__
-
-#ifndef NONAMELESSUNION
-#define NONAMELESSUNION
-#endif
 
 // ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error