Skip to content

W
wine-winehq
Commit 79f1638d authored by Uwe Bonnes's avatar Uwe Bonnes Committed by Alexandre Julliard
Browse files
Options

Fixes for C++ Winelib compilation.

parent 6dd19961
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
include/xmalloc.h
View file @ 79f1638d
#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 */
library/winestub.c
View file @ 79f1638d
...@@ -7,7 +7,11 @@ ...@@ -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: */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment