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/dc.cpp

    r21459 r21916  
    2828#include <winconst.h>
    2929#include <misc.h>
    30 #include <win32wbase.h>
    3130#include <math.h>
    3231#include <limits.h>
     32#include "win32wbase.h"
    3333#include "oslibwin.h"
    3434#include "oslibmsg.h"
    … …  
    617617   return erased;
    618618}
     619
     620extern "C" {
     621
    619622//******************************************************************************
    620623//******************************************************************************
    … …  
    12441247
    12451248        BytesNeeded = GetRegionData (hrgn, 0, NULL);
    1246         RgnData = (PRGNDATA)_alloca (BytesNeeded);
     1249        RgnData = (PRGNDATA)alloca (BytesNeeded);
    12471250        if (RgnData == NULL)
    12481251          goto error;
    … …  
    17431746//******************************************************************************
    17441747
     1748} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.