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/testapp/threads/threads.c

    r21614 r21916  
    2121#include <strsafe.h>
    2222#else
     23#include <stdio.h>
    2324#include <stdarg.h>
    2425void StringCchPrintf(LPTSTR pszDest, size_t cchDest,
    … …  
    241242        (lstrlen((LPCTSTR) lpMsgBuf) + lstrlen((LPCTSTR) lpszFunction) + 40) * sizeof(TCHAR));
    242243    StringCchPrintf((LPTSTR)lpDisplayBuf,
    243         LocalSize(lpDisplayBuf) / sizeof(TCHAR),
     244        LocalSize((HLOCAL)lpDisplayBuf) / sizeof(TCHAR),
    244245        TEXT("%s failed with error %d: %s"),
    245246        lpszFunction, dw, lpMsgBuf);
    … …  
    248249        // Free error-handling buffer allocations.
    249250
    250     LocalFree(lpMsgBuf);
    251     LocalFree(lpDisplayBuf);
    252 }
    253 
     251    LocalFree((HLOCAL)lpMsgBuf);
     252    LocalFree((HLOCAL)lpDisplayBuf);
     253}
     254
Note: See TracChangeset for help on using the changeset viewer.