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

    r21425 r21916  
    1717} CRITICAL_SECTION_OS2, *PCRITICAL_SECTION_OS2;
    1818
     19#ifndef OS2_INCLUDED
     20typedef const char *PCSZ;
     21#endif
     22
     23#ifdef __cplusplus
     24extern "C" {
     25#endif
     26
    1927ULONG WIN32API DosValidateCriticalSection (CRITICAL_SECTION_OS2 *crit);
    2028ULONG WIN32API DosDeleteCriticalSection(CRITICAL_SECTION_OS2 *);
    2129ULONG WIN32API DosEnterCriticalSection(CRITICAL_SECTION_OS2 *, ULONG ulTimeout = SEM_INDEFINITE_WAIT);
    22 ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *, char *pszSemName, BOOL fShared = FALSE);
    23 ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, char *pszSemName);
     30ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *, PCSZ pszSemName, BOOL fShared = FALSE);
     31ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, PCSZ pszSemName);
    2432ULONG WIN32API DosLeaveCriticalSection(CRITICAL_SECTION_OS2 *);
    2533
    … …  
    3442#endif
    3543
     44#ifdef __cplusplus
     45} // extern "C"
     46#endif
     47
    3648#endif //__ODINCRT_H__
Note: See TracChangeset for help on using the changeset viewer.