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/os2newapi.h

    r21380 r21916  
    77#ifndef __OS2NEWAPI_H__
    88#define __OS2NEWAPI_H__
     9
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
    913
    1014#ifdef INCL_WIN
    … …  
    4246USHORT APIENTRY16 DosSizeSeg(SEL sel, PULONG pcbSize);
    4347
     48#ifndef __EMX__
    4449#define DosSelToFlat Dos32SelToFlat
     50#endif
    4551ULONG _Optlink DosSelToFlat(ULONG seladdr);
    4652
     53#ifndef __EMX__
    4754#define DosFlatToSel Dos32FlatToSel
     55#endif
    4856ULONG _Optlink DosFlatToSel(ULONG lin);
    4957
    … …  
    6775                                   ULONG   ulSubFunction);
    6876
     77#ifdef __cplusplus
     78} // extern "C"
     79#endif
     80
    6981#endif //__OS2SEL_H__
Note: See TracChangeset for help on using the changeset viewer.