Alexandre Julliard : libport: Rename spawnvp to _spawnvp to avoid the deprecated name.
Alexandre Julliard
julliard at winehq.org
Tue Apr 9 13:41:28 CDT 2013
Module: wine
Branch: master
Commit: 43ac582d7dd74acd5e1ac91ebecbe302611b298d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ac582d7dd74acd5e1ac91ebecbe302611b298d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Apr 9 13:50:40 2013 +0200
libport: Rename spawnvp to _spawnvp to avoid the deprecated name.
---
configure | 1 -
configure.ac | 1 -
include/config.h.in | 3 ---
include/wine/port.h | 4 ++--
libs/port/spawn.c | 12 +++++-------
programs/explorer/desktop.c | 2 +-
programs/winebrowser/main.c | 2 +-
programs/winemenubuilder/winemenubuilder.c | 4 ++--
programs/winevdm/winevdm.c | 2 +-
tools/winebuild/utils.c | 2 +-
tools/winegcc/utils.c | 2 +-
11 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/configure b/configure
index 6997375..8d6d227 100755
--- a/configure
+++ b/configure
@@ -13066,7 +13066,6 @@ for ac_func in \
sigaltstack \
sigprocmask \
snprintf \
- spawnvp \
statfs \
statvfs \
strcasecmp \
diff --git a/configure.ac b/configure.ac
index 080e961..084a2d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2011,7 +2011,6 @@ AC_CHECK_FUNCS(\
sigaltstack \
sigprocmask \
snprintf \
- spawnvp \
statfs \
statvfs \
strcasecmp \
diff --git a/include/config.h.in b/include/config.h.in
index 2f30549..0a1d78a 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -734,9 +734,6 @@
/* Define to 1 if you have the `socketpair' function. */
#undef HAVE_SOCKETPAIR
-/* Define to 1 if you have the `spawnvp' function. */
-#undef HAVE_SPAWNVP
-
/* Define to 1 if the system has the type `ssize_t'. */
#undef HAVE_SSIZE_T
diff --git a/include/wine/port.h b/include/wine/port.h
index d6904c0..76a0b3e 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -353,8 +353,8 @@ extern int mkstemps(char *template, int suffix_len);
# define _P_NOWAITO 3
# define _P_DETACH 4
#endif
-#ifndef HAVE_SPAWNVP
-extern int spawnvp(int mode, const char *cmdname, const char * const argv[]);
+#ifndef HAVE__SPAWNVP
+extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
#endif
/* Interlocked functions */
diff --git a/libs/port/spawn.c b/libs/port/spawn.c
index 0cdc08c..97364e7 100644
--- a/libs/port/spawn.c
+++ b/libs/port/spawn.c
@@ -21,6 +21,8 @@
#include "config.h"
#include "wine/port.h"
+#ifndef HAVE__SPAWNVP
+
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
@@ -32,10 +34,8 @@
# include <unistd.h>
#endif
-#ifndef HAVE_SPAWNVP
-int spawnvp(int mode, const char *cmdname, const char *const argv[])
+int _spawnvp(int mode, const char *cmdname, const char *const argv[])
{
-#ifndef HAVE__SPAWNVP
int pid, status, wret;
if (mode == _P_OVERLAY)
@@ -93,8 +93,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[])
}
return pid;
-#else /* HAVE__SPAWNVP */
- return _spawnvp(mode, cmdname, argv);
-#endif /* HAVE__SPAWNVP */
}
-#endif /* HAVE_SPAWNVP */
+
+#endif /* HAVE__SPAWNVP */
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 4c8e599..7cfa0d1 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -45,7 +45,7 @@ static BOOL start_screensaver( void )
if (using_root)
{
const char *argv[3] = { "xdg-screensaver", "activate", NULL };
- int pid = spawnvp( _P_DETACH, argv[0], argv );
+ int pid = _spawnvp( _P_DETACH, argv[0], argv );
if (pid > 0)
{
WINE_TRACE( "started process %d\n", pid );
diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
index ad46b20..22f3a93 100644
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c
@@ -90,7 +90,7 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 )
argv_new[1] = cmdline;
argv_new[2] = NULL;
- spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */
+ _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */
app = strtok( NULL, "," ); /* grab the next app */
}
WINE_ERR( "could not find a suitable app to run\n" );
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index c931363..9c81ab8 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -3371,11 +3371,11 @@ static void RefreshFileTypeAssociations(void)
argv[0] = "update-mime-database";
argv[1] = mime_dir;
argv[2] = NULL;
- spawnvp( _P_DETACH, argv[0], argv );
+ _spawnvp( _P_DETACH, argv[0], argv );
argv[0] = "update-desktop-database";
argv[1] = applications_dir;
- spawnvp( _P_DETACH, argv[0], argv );
+ _spawnvp( _P_DETACH, argv[0], argv );
}
end:
diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index d297551..b818d76 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -198,7 +198,7 @@ static void start_dosbox( const char *appname, const char *args )
args[1] = "-conf";
args[2] = config_file;
args[3] = NULL;
- ret = spawnvp( _P_WAIT, args[0], args );
+ ret = _spawnvp( _P_WAIT, args[0], args );
}
CloseHandle( file );
DeleteFileW( config );
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 40a9afe..1c77e41 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -268,7 +268,7 @@ void spawn( struct strarray *args )
for (i = 0; args->str[i]; i++)
fprintf( stderr, "%s%c", args->str[i], args->str[i+1] ? ' ' : '\n' );
- if ((status = spawnvp( _P_WAIT, args->str[0], args->str )))
+ if ((status = _spawnvp( _P_WAIT, args->str[0], args->str )))
{
if (status > 0) fatal_error( "%s failed with status %u\n", args->str[0], status );
else fatal_perror( "winebuild" );
diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c
index 05b9a65..75fb20b 100644
--- a/tools/winegcc/utils.c
+++ b/tools/winegcc/utils.c
@@ -334,7 +334,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors)
printf("\n");
}
- if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors)
+ if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors)
{
if (status > 0) error("%s failed\n", argv[0]);
else perror("winegcc");
More information about the wine-cvs
mailing list