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

    r10376 r21916  
    284284//******************************************************************************
    285285
    286 #pragma data_seg(_GLOBALDATA)
     286//
     287// Global DLL Data (keep it in sync with globaldata.asm!)
     288//
    287289extern CRITICAL_SECTION_OS2 globalmapcritsect;
    288 #pragma data_seg()
    289290
    290291void InitializeMemMaps();
Note: See TracChangeset for help on using the changeset viewer.