Ignore:
Timestamp:
Nov 3, 2011, 7:45:31 PM (14 years ago)
Author:
dmik
Message:

Extern "C".

Mostly, to fix the GCC bug with stdcall not suppressing C++ mangling.

Location:
branches/gcc-kmk/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/include/kbdhook.h

    r10383 r21790  
    2929#define PMKBDHK_HOOK_TERM   "_hookKill@0"
    3030
     31#ifdef __cplusplus
     32extern "C" {
     33#endif
    3134
    3235typedef BOOL  (* WIN32API PFN_HOOKINIT)(ULONG hab, char *lpszWindowClass);
    … …  
    3639BOOL WIN32API hookKill(ULONG hab);
    3740
     41#ifdef __cplusplus
     42} // extern "C"
     43#endif
     44
    3845#endif  // __KBDHOOK_H
    3946

  • branches/gcc-kmk/include/odinwrap.h

    r7357 r21790  
    6060#include <malloc.h>
    6161#include <odin.h>
     62
     63//#ifdef __cplusplus
     64extern "C" {
     65//#endif
    6266
    6367// ---------------------------------------------------------------------------
    … …  
    7579extern char*             WIN32API dbg_GetLastCallerName();
    7680
    77 
     81//#ifdef __cplusplus
     82} // extern "C"
     83//#endif
    7884
    7985// ---------------------------------------------------------------------------
    … …  
    13451351#define ODINPROCEDURE14(cName,t1,a1,t2,a2,t3,a3,t4,a4,t5,a5,t6,a6,t7,a7,t8,a8,t9,a9,t10,a10,t11,a11,t12,a12,t13,a13,t14,a14)  \
    13461352  void WINAPI cName(t1 a1,t2 a2,t3 a3,t4 a4,t5 a5,t6 a6,t7 a7,t8 a8,t9 a9,t10 a10,t11 a11,t12 a12,t13 a13,t14 a14)    \
    1347  
     1353
    13481354#define ODINFUNCTIONNODBG0   ODINFUNCTION0
    13491355#define ODINFUNCTIONNODBG1   ODINFUNCTION1

  • branches/gcc-kmk/include/os2newapi.h

    r21380 r21790  
    77#ifndef __OS2NEWAPI_H__
    88#define __OS2NEWAPI_H__
     9
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
    913
    1014#ifdef INCL_WIN
    … …  
    4246USHORT APIENTRY16 DosSizeSeg(SEL sel, PULONG pcbSize);
    4347
     48#ifndef __EMX__
    4449#define DosSelToFlat Dos32SelToFlat
     50#endif
    4551ULONG _Optlink DosSelToFlat(ULONG seladdr);
    4652
     53#ifndef __EMX__
    4754#define DosFlatToSel Dos32FlatToSel
     55#endif
    4856ULONG _Optlink DosFlatToSel(ULONG lin);
    4957
    … …  
    6775                                   ULONG   ulSubFunction);
    6876
     77#ifdef __cplusplus
     78} // extern "C"
     79#endif
     80
    6981#endif //__OS2SEL_H__

  • branches/gcc-kmk/include/win/global.h

    r4 r21790  
    1818    int shmid;
    1919} SHMDATA;
     20
     21#ifdef __cplusplus
     22extern "C" {
     23#endif
    2024
    2125/* memory/global.c */
    … …  
    4549extern BOOL ATOM_Init( WORD globalTableSel );
    4650
     51#ifdef __cplusplus
     52} // extern "C"
     53#endif
     54
    4755#endif  /* __WINE_GLOBAL_H */

  • branches/gcc-kmk/include/win/virtual.h

    r7566 r21790  
    88#define __VIRTUAL_H
    99
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
     13
    1014HANDLE WINAPI VIRTUAL_MapFileA( LPCSTR name , LPVOID *lpMapping, BOOL fReadIntoMemory = FALSE);
    1115HANDLE WINAPI VIRTUAL_MapFileW( LPCWSTR name , LPVOID *lpMapping, BOOL fReadIntoMemory = FALSE);
    … …  
    1418                          DWORD  fdwProtect, LPSTR name);
    1519
     20#ifdef __cplusplus
     21} // extern "C"
     22#endif
     23
    1624#endif  /* __VIRTUAL_H */
Note: See TracChangeset for help on using the changeset viewer.