Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/include/cpuhlp.h

    r8991 r21916  
    3939#if (__IBMC__ >= 360) || (__IBMCPP__ >= 360)
    4040#define CONTROL87(a,b)  __control87(a, b)
    41 #else
    42 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
     41#elif (__IBMCPP__ == 300) || (__IBMC__ == 300)
    4342#define CONTROL87(a,b)  _control87(a, b)
    44 #else
    45 #ifdef __WATCOMC__
     43#elif defined(__WATCOMC__) || defined(__GNUC__)
    4644#define CONTROL87(a,b)  _control87(a, b)
    4745#else
    4846#error  CONTROL87 undefined
    49 #endif
    50 #endif
    5147#endif
    5248
Note: See TracChangeset for help on using the changeset viewer.