Fixes for C++ Winelib compilation.
This commit is contained in:
parent
6dd19961c5
commit
79f1638df2
|
@ -1,9 +1,17 @@
|
||||||
#ifndef __WINE_XMALLOC_H
|
#ifndef __WINE_XMALLOC_H
|
||||||
#define __WINE_XMALLOC_H
|
#define __WINE_XMALLOC_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
void *xmalloc( int size );
|
void *xmalloc( int size );
|
||||||
void *xcalloc( int size );
|
void *xcalloc( int size );
|
||||||
void *xrealloc( void *ptr, int size );
|
void *xrealloc( void *ptr, int size );
|
||||||
char *xstrdup( const char *str );
|
char *xstrdup( const char *str );
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __WINE_XMALLOC_H */
|
#endif /* __WINE_XMALLOC_H */
|
||||||
|
|
|
@ -7,7 +7,11 @@
|
||||||
extern int PASCAL WinMain(HINSTANCE32,HINSTANCE32,LPSTR,int);
|
extern int PASCAL WinMain(HINSTANCE32,HINSTANCE32,LPSTR,int);
|
||||||
|
|
||||||
/* external declaration here because we don't want to depend on Wine headers */
|
/* external declaration here because we don't want to depend on Wine headers */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
|
||||||
|
#else
|
||||||
extern HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
|
extern HINSTANCE32 MAIN_WinelibInit( int *argc, char *argv[] );
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Most Windows C/C++ compilers use something like this to */
|
/* Most Windows C/C++ compilers use something like this to */
|
||||||
/* access argc and argv globally: */
|
/* access argc and argv globally: */
|
||||||
|
|
Loading…
Reference in New Issue