We can just pass NULL as the 'envp' argument to PR_CreateProcess, so we
do not need to get the declaration of 'environ' on Unix. Reviewed by Nelson Bolyard. git-svn-id: svn://10.0.0.236/trunk@85811 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
79219dcf9f
commit
cce6466b5f
@ -42,30 +42,6 @@
|
||||
|
||||
#include "secutil.h"
|
||||
|
||||
#if defined(XP_UNIX)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(IRIX) && !defined(environ)
|
||||
/* This is supposed to be in unistd.h, but isn't. */
|
||||
extern char **_environ;
|
||||
#define environ _environ
|
||||
#endif
|
||||
|
||||
#if defined(SOLARIS)
|
||||
extern char ** environ;
|
||||
#endif
|
||||
|
||||
#if defined(LINUX) && !defined(__USE_GNU)
|
||||
#define environ __environ
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define ENVP_ARG NULL
|
||||
#else
|
||||
#define ENVP_ARG environ
|
||||
#endif
|
||||
|
||||
#if defined(_WINDOWS)
|
||||
#include <process.h> /* for getpid() */
|
||||
#endif
|
||||
@ -1110,7 +1086,7 @@ haveAChild(int argc, char **argv, PRProcessAttr * attr)
|
||||
{
|
||||
PRProcess * newProcess;
|
||||
|
||||
newProcess = PR_CreateProcess(argv[0], argv, ENVP_ARG, attr);
|
||||
newProcess = PR_CreateProcess(argv[0], argv, NULL, attr);
|
||||
if (!newProcess) {
|
||||
errWarn("Can't create new process.");
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user