Changeset 21597 for trunk/include


Ignore:
Timestamp:
Mar 23, 2011, 5:48:24 PM (14 years ago)
Author:
dmik
Message:

headers: VAC <= 3.0 doesn't understand _inline in C mode, so use _Inline instead.

Location:
trunk/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin.h

    r21584 r21597  
    111111  #ifndef __cplusplus
    112112    #define INLINE  _Inline
     113    #ifndef inline
    113114    #define inline  INLINE
     115    #endif
    114116  #else
    115117    #define INLINE  inline

  • trunk/include/os2mewrap.h

    r2244 r21597  
    1010#include <os2me.h>
    1111
    12 #if (__IBMC__ > 300)
    13 // VA3.6: inline is a C++ keyword, must be translated to _inline or _Inline or __inline in C code
    14 #define inline _inline
     12// VAC: inline is a C++ keyword, must be translated to _Inline in C code
     13#if (defined(__IBMCPP__) || defined(__IBMC__))
     14#ifndef __cplusplus
     15#define inline  _Inline
    1516#endif
    16 
     17#endif
    1718
    1819#ifdef INCL_MCIOS2

  • trunk/include/os2wrap.h

    r21424 r21597  
    1111#include <os2newapi.h>
    1212
    13 #if (__IBMC__ > 300)
    14 // VA3.6: inline is a C++ keyword, must be translated to _inline or _Inline or __inline in C code
    15 #define inline _inline
     13// VAC: inline is a C++ keyword, must be translated to _Inline in C code
     14#if (defined(__IBMCPP__) || defined(__IBMC__))
     15#ifndef __cplusplus
     16#define inline  _Inline
     17#endif
    1618#endif
    1719
Note: See TracChangeset for help on using the changeset viewer.