Changeset 6102 for trunk/include/odin.h

Timestamp:

Jun 26, 2001, 12:55:07 AM (24 years ago)

Author:

bird

Message:

Inline definitions. EMX updated and more like working. attribute_ for none GNU compilers.

File:

• trunk/include/odin.h (modified) (6 diffs)

trunk/include/odin.h

@@ -53 +53 @@
   #define SYSTEM    _System
   #define PASCAL    __stdcall
+  #define INLINE    inline              /* is this allowed for C too? */
   #define UNALIGNED
+  #define __attribute__(x)
 
 //MN: For some strange reason Watcom doesn't define these for C++!
@@ -66 +68 @@
 /* ---------- GCC/EMX ---------- */
 #ifdef __GNUC__
+  #if defined(__GNUC__) && (__GNUC__ <= 2) && (__GNUC_MINOR__ < 7)
+    #error You need gcc >= 2.7 to build Odin32
+  #endif
+  #if !defined(__stdcall__)             /* this is also defined in windef.h if !defined(WIN32OS2) */
+    #define __stdcall __attribute__((__stdcall__))
+    #define __cdecl   __attribute__((__cdecl__))
+  #endif
   #define CDECL     _cdecl
   #define EXPORT    _export
@@ -72 +81 @@
   #define SYSTEM    __stdcall
   #define PASCAL    __stdcall
+  #define INLINE    __inline__
   #define UNALIGNED
   #define NONAMELESSUNION
@@ -79 +89 @@
 /* ---------- VAC ---------- */
 #if (defined(__IBMCPP__) || defined(__IBMC__))
+
   #define CDECL     __cdecl
   #define EXPORT    _Export
@@ -86 +97 @@
   #define PASCAL    __stdcall
   #define UNALIGNED
-  #define __inline__ inline
+  #ifndef __cplusplus
+    #define INLINE  _Inline
+    #define inline  INLINE
+  #else
+    #define INLINE  inline
+  #endif
+  #define __inline__ INLINE
+  #define __attribute__(x)
+
 
 #ifndef RC_INVOKED
@@ -107 +126 @@
 #ifdef RC_INVOKED
   //SvL: wrc chokes on calling conventions....
-  #define CDECL     
-  #define EXPORT    
-  #define WIN32API  
-  #define WINAPI    
-  #define CALLBACK    
-  #define SYSTEM    
-  #define PASCAL    
+  #define CDECL
+  #define EXPORT
+  #define WIN32API
+  #define WINAPI
+  #define CALLBACK
+  #define SYSTEM
+  #define PASCAL
   #define UNALIGNED
   #define __cdecl
   #define _System
-  #define __inline__ 
+  #define __inline__
+  #define INLINE
 #else
 /* ---------- ??? ---------- */