Ignore:
Timestamp:
Aug 10, 2003, 5:24:21 PM (22 years ago)
Author:
zap
Message:

Fixed conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/emx/include/unidef.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r565 r566  
    3838#endif
    3939#ifndef APIENTRY
    40 #define APIENTRY _System
     40# ifdef _System
     41#  define APIENTRY _System
     42# else
     43#  define APIENTRY
     44# endif
    4145#endif
    4246
Note: See TracChangeset for help on using the changeset viewer.