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/msacm32/driver.c

    r6712 r21916  
    2525#ifdef __WIN32OS2__
    2626#include "winnls.h"
    27 #define snprintf wvsnprintfA
     27#define snprintf wsnprintfA
    2828#endif
    2929
    … …  
    320320   
    321321    for (dwPriorityCounter = 1; ; dwPriorityCounter++)  {
    322         snprintf(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
    323         lError = RegQueryValueA(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
    324         if (lError != ERROR_SUCCESS)
    325             break;
     322        snprintf(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
     323        lError = RegQueryValueA(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
     324        if (lError != ERROR_SUCCESS)
     325            break;
    326326       
    327         FIXME("(0x%08x, %ld, %ld): stub (partial)\n",
     327        FIXME("(0x%08x, %ld, %ld): stub (partial)\n",
    328328              hadid, dwPriority, fdwPriority);
    329         break;
     329        break;
    330330    }
    331331   
Note: See TracChangeset for help on using the changeset viewer.