зеркало из https://github.com/mozilla/gecko-dev.git
bug 92222 -- get xpinstall wizard building on IRIX. patch thanks to
johnv@adacel.com.au (John Mark Vandenberg), r=me, sr=kin@netscape.com
This commit is contained in:
Родитель
5bf455c8bd
Коммит
85ed1c05ce
|
@ -50,7 +50,7 @@
|
|||
#ifndef macintosh
|
||||
#include "platform.h" // for SOLARIS define
|
||||
#endif
|
||||
#if defined(SOLARIS) || defined(_WINDOWS)
|
||||
#if defined(SOLARIS) || defined(_WINDOWS) || defined(IRIX)
|
||||
#define socklen_t int
|
||||
#endif
|
||||
|
||||
|
|
|
@ -463,14 +463,14 @@ nsXIEngine::Install(int aCustom, nsComponentList *aComps, char *aDestination)
|
|||
return E_PARAM;
|
||||
|
||||
// handle LD_LIBRARY_PATH settings
|
||||
#ifdef SOLARIS
|
||||
#if defined (SOLARIS) || defined (IRIX)
|
||||
sprintf(new_LD_LIBRARY_PATH, "LD_LIBRARY_PATH=%s/bin:.", mTmp);
|
||||
#else
|
||||
sprintf(new_LD_LIBRARY_PATH, "%s/bin:.", mTmp);
|
||||
#endif
|
||||
DUMP(new_LD_LIBRARY_PATH);
|
||||
old_LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");
|
||||
#ifdef SOLARIS
|
||||
#if defined (SOLARIS) || defined (IRIX)
|
||||
putenv(new_LD_LIBRARY_PATH);
|
||||
#else
|
||||
setenv("LD_LIBRARY_PATH", new_LD_LIBRARY_PATH, 1);
|
||||
|
@ -511,7 +511,7 @@ nsXIEngine::Install(int aCustom, nsComponentList *aComps, char *aDestination)
|
|||
}
|
||||
|
||||
// restore LD_LIBRARY_PATH settings
|
||||
#ifdef SOLARIS
|
||||
#if defined (SOLARIS) || defined (IRIX)
|
||||
char old_LD_env[MAXPATHLEN];
|
||||
|
||||
sprintf(old_LD_env, "LD_LIBRARY_PATH=%s", old_LD_LIBRARY_PATH);
|
||||
|
|
Загрузка…
Ссылка в новой задаче