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/include/winres.h

    r9849 r21916  
    1111#define __WINRES_H__
    1212
     13#ifdef __cplusplus
     14extern "C" {
     15#endif
     16
    1317PVOID WIN32API ConvertResourceToOS2(HINSTANCE hInstance, LPSTR restype, HRSRC hResource);
    1418ULONG WIN32API QueryConvertedResourceSize(HINSTANCE hInstance, LPSTR restype, HRSRC hResource);
    … …  
    1923void *WIN32API ConvertIconGroupIndirect(void *lpIconData, DWORD iconsize, DWORD *ressize);
    2024
     25#ifdef __cplusplus
     26} // extern "C"
    2127#endif
     28
     29#endif
Note: See TracChangeset for help on using the changeset viewer.