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/odincrt/critsect.cpp

    r10580 r21916  
    3535        return NO_ERROR;
    3636    }
    37    
     37
    3838    return ERROR_INVALID_PARAMETER;
    3939}
    … …  
    101101 */
    102102ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit,
    103                                             PSZ pszSemName, BOOL fShared)
     103                                            PCSZ pszSemName, BOOL fShared)
    104104{
    105105    APIRET rc;
    … …  
    125125 *           DosAccessCriticalSection
    126126 */
    127 ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
     127ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *crit, PCSZ pszSemName)
    128128{
    129129    APIRET rc = NO_ERROR;
    130    
    131     // Increment creation counter to prevent the section to be destroyed while 
     130
     131    // Increment creation counter to prevent the section to be destroyed while
    132132    // we are checking it. Assume that an unitialized section has the counter == 0
    133133    DosInterlockedIncrement(&crit->CreationCount);
    134    
     134
    135135    if (DosValidateCriticalSection (crit) == NO_ERROR)
    136136    {
    137137        // the section already initialized, use it
    138138        HEV hevLock = NULLHANDLE;
    139        
     139
    140140        if (pszSemName == NULL)
    141141        {
    … …  
    155155        rc = DosInitializeCriticalSection (crit, pszSemName, TRUE);
    156156    }
    157      
     157
    158158    return NO_ERROR;
    159159}
Note: See TracChangeset for help on using the changeset viewer.