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/oslibprf.h

    r9854 r21916  
    2323extern "C" {
    2424
    25 LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, char *pszApp, char *pszKey, LONG sDefault);
    26 LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, char *pszApp, char *pszKey, char *pszDefault, char *buffer, ULONG buflen);
     25LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, const char *pszApp, const char *pszKey, LONG sDefault);
     26LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, const char *pszApp, const char *pszKey, const char *pszDefault, char *buffer, ULONG buflen);
    2727
    2828}
Note: See TracChangeset for help on using the changeset viewer.