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/src/kernel32/dosqss.h

    r1924 r21916  
    77#endif
    88
    9 #ifdef __cplusplus
    10 extern "C" {
    11 #endif
    12 APIRET APIENTRY DosQuerySysState(ULONG func,ULONG arg1,ULONG arg2,
    13                                  ULONG _res_,PVOID buf,ULONG bufsz);
    14 
    15 #ifdef __cplusplus
    16 }
    17 #endif
    18 
    19 inline APIRET _DosQuerySysState(ULONG func,ULONG arg1,ULONG arg2,
    20                                 ULONG _res_,PVOID buf,ULONG bufsz)
    21 {
    22  APIRET yyrc;
    23  USHORT sel = RestoreOS2FS();
    24 
    25     yyrc = DosQuerySysState(func, arg1, arg2, _res_, buf, bufsz);
    26     SetFS(sel);
    27 
    28     return yyrc;
    29 }
     9/* DosQuerySysState is declared in os2wrap.h */
    3010
    3111#undef  DosAllocMem
Note: See TracChangeset for help on using the changeset viewer.