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

    r5308 r21916  
    7070  ULONG     ulID;                  // Resource ID for dialog page
    7171  PFNWP     wpDlgProc;             // dialog window procedure
    72   PSZ       szStatusLineText;      // Text to go on status line
    73   PSZ       szTabText;             // Text to go on major tab
     72  PCSZ      szStatusLineText;      // Text to go on status line
     73  PCSZ      szTabText;             // Text to go on major tab
    7474  ULONG     idFocus;               // ID of the control to get the focus first
    7575  BOOL      fParent;               // Is this a Parent page with minor pages
    … …  
    9292/**********************************************************************/
    9393
    94 static VOID ErrorMsg( PSZ szFormat,
    95                      ... );
     94static VOID ErrorMsg(PCSZ szFormat,
     95                     ...);
    9696
    9797
    … …  
    195195};
    196196
    197 static PSZ priorities[] = {"idle", "normal", "critical", "server"};
     197static PCSZ priorities[] = {"idle", "normal", "critical", "server"};
    198198#define NUMPRIORITIES 4
    199199
    … …  
    216216#define MESSAGE_SIZE 1024
    217217
    218 static VOID ErrorMsg( PSZ szFormat,
    219                      ... )
     218static VOID ErrorMsg(PCSZ szFormat,
     219                     ...)
    220220{
    221221  PSZ     szMsg;
Note: See TracChangeset for help on using the changeset viewer.