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/user32/win32wndhandle.cpp

    r10544 r21916  
    2828//******************************************************************************
    2929
    30 //Global DLL Data
    31 #pragma data_seg(_GLOBALDATA)
    32 ULONG                WindowHandleTable[MAX_WINDOW_HANDLES] = {0};
    33 CRITICAL_SECTION_OS2 globalwhandlecritsect = {0};
    34 ULONG                lastIndex = 0;
    35 #pragma data_seg()
     30//
     31// Global DLL Data (keep it in sync with globaldata.asm!)
     32//
     33extern ULONG                WindowHandleTable[MAX_WINDOW_HANDLES]; // = {0}
     34extern CRITICAL_SECTION_OS2 globalwhandlecritsect; // = {0}
     35extern ULONG                lastIndex; // = 0
    3636
    37 static char *pszWndHandleSemName = WINHANDLE_CRITSECTION_NAME;
     37//******************************************************************************
     38//******************************************************************************
     39
     40static const char *pszWndHandleSemName = WINHANDLE_CRITSECTION_NAME;
    3841
    3942//******************************************************************************
    … …  
    7174        lastIndex = 0;
    7275  }
    73   for(int i=lastIndex;i<MAX_WINDOW_HANDLES;i++) {
     76  int i;
     77  for(i=lastIndex;i<MAX_WINDOW_HANDLES;i++) {
    7478        if(WindowHandleTable[i] == 0) {
    7579                lastIndex = i;
Note: See TracChangeset for help on using the changeset viewer.