Commit 11e81141 authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard

libwine: Always build preloading code.

parent 9cf7f954
...@@ -456,7 +456,6 @@ const char *wine_get_build_id(void) ...@@ -456,7 +456,6 @@ const char *wine_get_build_id(void)
/* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */
static void preloader_exec( char **argv, int use_preloader ) static void preloader_exec( char **argv, int use_preloader )
{ {
#ifdef linux
if (use_preloader) if (use_preloader)
{ {
static const char preloader[] = "wine-preloader"; static const char preloader[] = "wine-preloader";
...@@ -483,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader ) ...@@ -483,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader )
free( new_argv ); free( new_argv );
free( full_name ); free( full_name );
} }
#endif
execv( argv[0], argv ); execv( argv[0], argv );
} }
...@@ -494,7 +492,12 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) ...@@ -494,7 +492,12 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var )
int use_preloader; int use_preloader;
if (!name) name = argv0_name; /* no name means default loader */ if (!name) name = argv0_name; /* no name means default loader */
#ifdef linux
use_preloader = !strendswith( name, "wineserver" ); use_preloader = !strendswith( name, "wineserver" );
#else
use_preloader = 0;
#endif
if ((ptr = strrchr( name, '/' ))) if ((ptr = strrchr( name, '/' )))
{ {
......
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