Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
1 deleted
2 edited
1 copied

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/testapp/gui/fontlist/XFont.cpp

    r21539 r21916  
    2222#include "XFont.h"
    2323
    24 //#define TRACE(a,...)  do {} while(0)
     24#ifdef __GNUC__
     25#define TRACE(a,...)  do {} while(0)
     26#else
    2527#define TRACE ((void)0)
     28#endif
    2629#define _ASSERTE(a) do {} while(0)
    2730
    … …  
    591594    *pnVersion = WUNKNOWN;
    592595
    593     TCHAR *cp = NULL;
     596    const TCHAR *cp = NULL;
    594597
    595598    OSVERSIONINFO osinfo;
Note: See TracChangeset for help on using the changeset viewer.