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

    r21327 r21916  
    22#define __CUSTOMBUILD_H__
    33
    4 #include <win\peexe.h>
     4#include <win/peexe.h>
    55#include <initdll.h>
    66
    … …  
    3434typedef BOOL (WIN32API *PFN_ENDCUSTOMIZE)();
    3535typedef BOOL (WIN32API *PFN_ISPESTUBLOADER)(char *pszProgram);
     36
     37typedef ULONG (APIENTRY *PFN_INITDLL)(ULONG hModule, ULONG ulFlag);
     38typedef void  (APIENTRY *PFN_CLEANUPDLL)(ULONG ulReason);
    3639
    3740typedef struct {
    … …  
    139142
    140143} CUSTOMBUILD_COMMON;
     144
     145#ifdef __cplusplus
     146extern "C" {
     147#endif
    141148
    142149BOOL WIN32API LoadCustomEnvironment(CUSTOMBUILD_COMMON *CustomBuild);
    … …  
    251258//Override std class names used in Odin
    252259void  WIN32API SetCustomStdClassName(LPSTR pszStdClassName);
    253 char *WIN32API QueryCustomStdClassName();
     260const char *WIN32API QueryCustomStdClassName();
    254261
    255262//Turn off ASPI
    … …  
    509516
    510517//PE headers of system dlls
    511 #ifdef __cplusplus
    512 extern "C" {
    513 #endif
    514518extern IMAGE_FILE_HEADER nt_ntdll_header;
    515519extern IMAGE_FILE_HEADER nt_gdi32_header;
    … …  
    552556extern IMAGE_FILE_HEADER nt_winscard_header;
    553557extern IMAGE_FILE_HEADER nt_shdocvw_header;
     558
    554559#ifdef __cplusplus
    555 }
     560} // extern "C"
    556561#endif
    557562
Note: See TracChangeset for help on using the changeset viewer.