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

    r5308 r21916  
    268268                               szKey,
    269269                               0,
    270                                "",
     270                               NULL,
    271271                               0,
    272272                               KEY_ALL_ACCESS,
    … …  
    281281#define REGSAVEVALUE(name,var) \
    282282  lRes = RegSetValueExA(hkConsole, name, 0, REG_DWORD, \
    283                  (LPBYTE)&pConsoleOptions->var, sizeof(pConsoleOptions->var));
     283                 (const BYTE *)&pConsoleOptions->var, sizeof(pConsoleOptions->var));
    284284
    285285  REGSAVEVALUE("AutomaticTermination",     fTerminateAutomatically)
Note: See TracChangeset for help on using the changeset viewer.