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/gdi32/devcontext.cpp

    r21630 r21916  
    145145      devmode.dmDriverExtra      = arg4->dmDriverExtra;
    146146      devmode.dmFields           = arg4->dmFields;
    147 #if (__IBMCPP__ == 360)
     147#if defined (__GNUC__) || (__IBMCPP__ == 360)
    148148      devmode.dmOrientation   = arg4->dmOrientation;
    149149      devmode.dmPaperSize     = arg4->dmPaperSize;
    … …  
    258258      devmode.dmDriverExtra      = arg4->dmDriverExtra;
    259259      devmode.dmFields           = arg4->dmFields;
    260 #if (__IBMCPP__ == 360)
     260#if defined (__GNUC__) || (__IBMCPP__ == 360)
    261261      devmode.dmOrientation      = arg4->dmOrientation;
    262262      devmode.dmPaperSize        = arg4->dmPaperSize;
    … …  
    446446        dprintf(("devmode.dmDriverExtra %x", lpInitData->dmDriverExtra));
    447447        dprintf(("devmode.dmFields %x", lpInitData->dmFields));
    448 #if (__IBMCPP__ == 360)
     448#if defined (__GNUC__) || (__IBMCPP__ == 360)
    449449        dprintf(("devmode.dmOrientation %x", lpInitData->dmOrientation));
    450450        dprintf(("devmode.dmPaperSize %x", lpInitData->dmPaperSize));
Note: See TracChangeset for help on using the changeset viewer.