mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-27 09:37:31 +09:00
parent
769e5dad1e
commit
fdc5d93422
4 changed files with 2 additions and 36 deletions
|
|
@ -19,12 +19,7 @@
|
||||||
#include "nsIPrefService.h"
|
#include "nsIPrefService.h"
|
||||||
|
|
||||||
#define LOCAL_PLUGIN_DLL_SUFFIX ".so"
|
#define LOCAL_PLUGIN_DLL_SUFFIX ".so"
|
||||||
#if defined(__hpux)
|
#if defined(LINUX)
|
||||||
#define DEFAULT_X11_PATH "/usr/lib/X11R6/"
|
|
||||||
#undef LOCAL_PLUGIN_DLL_SUFFIX
|
|
||||||
#define LOCAL_PLUGIN_DLL_SUFFIX ".sl"
|
|
||||||
#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
|
|
||||||
#elif defined(LINUX)
|
|
||||||
#define DEFAULT_X11_PATH "/usr/X11R6/lib/"
|
#define DEFAULT_X11_PATH "/usr/X11R6/lib/"
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#define DEFAULT_X11_PATH "/usr/X11R6/lib"
|
#define DEFAULT_X11_PATH "/usr/X11R6/lib"
|
||||||
|
|
@ -97,11 +92,7 @@ static bool LoadExtraSharedLib(const char *name, char **soname, bool tryToGetSon
|
||||||
|
|
||||||
#define PLUGIN_MAX_NUMBER_OF_EXTRA_LIBS 32
|
#define PLUGIN_MAX_NUMBER_OF_EXTRA_LIBS 32
|
||||||
#define PREF_PLUGINS_SONAME "plugin.soname.list"
|
#define PREF_PLUGINS_SONAME "plugin.soname.list"
|
||||||
#if defined(HPUX)
|
|
||||||
#define DEFAULT_EXTRA_LIBS_LIST "libXt" LOCAL_PLUGIN_DLL_SUFFIX ":libXext" LOCAL_PLUGIN_DLL_SUFFIX ":libXm" LOCAL_PLUGIN_DLL_SUFFIX
|
|
||||||
#else
|
|
||||||
#define DEFAULT_EXTRA_LIBS_LIST "libXt" LOCAL_PLUGIN_DLL_SUFFIX ":libXext" LOCAL_PLUGIN_DLL_SUFFIX
|
#define DEFAULT_EXTRA_LIBS_LIST "libXt" LOCAL_PLUGIN_DLL_SUFFIX ":libXext" LOCAL_PLUGIN_DLL_SUFFIX
|
||||||
#endif
|
|
||||||
/*
|
/*
|
||||||
this function looks for
|
this function looks for
|
||||||
user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so.6:libXext.so");
|
user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so.6:libXext.so");
|
||||||
|
|
@ -275,15 +266,9 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary **outLibrary)
|
||||||
// work fine.
|
// work fine.
|
||||||
|
|
||||||
|
|
||||||
#if defined(HPUX)
|
|
||||||
// Acrobat/libXm: Lazy resolving might cause crash later (bug 211587)
|
|
||||||
*outLibrary = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW);
|
|
||||||
pLibrary = *outLibrary;
|
|
||||||
#else
|
|
||||||
// Some dlopen() doesn't recover from a failed PR_LD_NOW (bug 223744)
|
// Some dlopen() doesn't recover from a failed PR_LD_NOW (bug 223744)
|
||||||
*outLibrary = PR_LoadLibraryWithFlags(libSpec, 0);
|
*outLibrary = PR_LoadLibraryWithFlags(libSpec, 0);
|
||||||
pLibrary = *outLibrary;
|
pLibrary = *outLibrary;
|
||||||
#endif
|
|
||||||
if (!pLibrary) {
|
if (!pLibrary) {
|
||||||
LoadExtraSharedLibs();
|
LoadExtraSharedLibs();
|
||||||
// try reload plugin once more
|
// try reload plugin once more
|
||||||
|
|
|
||||||
|
|
@ -23,16 +23,7 @@ UnaryExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
double value = exprRes->numberValue();
|
double value = exprRes->numberValue();
|
||||||
#ifdef HPUX
|
|
||||||
/*
|
|
||||||
* Negation of a zero doesn't produce a negative
|
|
||||||
* zero on HPUX. Perform the operation by multiplying with
|
|
||||||
* -1.
|
|
||||||
*/
|
|
||||||
return aContext->recycler()->getNumberResult(-1 * value, aResult);
|
|
||||||
#else
|
|
||||||
return aContext->recycler()->getNumberResult(-value, aResult);
|
return aContext->recycler()->getNumberResult(-value, aResult);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TX_IMPL_EXPR_STUBS_1(UnaryExpr, NODESET_RESULT, expr)
|
TX_IMPL_EXPR_STUBS_1(UnaryExpr, NODESET_RESULT, expr)
|
||||||
|
|
|
||||||
|
|
@ -662,7 +662,7 @@ env_setProperty(JSContext* cx, HandleObject obj, HandleId id, MutableHandleValue
|
||||||
JSAutoByteString value(cx, valstr);
|
JSAutoByteString value(cx, valstr);
|
||||||
if (!value)
|
if (!value)
|
||||||
return false;
|
return false;
|
||||||
#if defined XP_WIN || defined HPUX || defined OSF1 || defined SCO
|
#if defined XP_WIN || defined SCO
|
||||||
{
|
{
|
||||||
char* waste = JS_smprintf("%s=%s", name.ptr(), value.ptr());
|
char* waste = JS_smprintf("%s=%s", name.ptr(), value.ptr());
|
||||||
if (!waste) {
|
if (!waste) {
|
||||||
|
|
@ -670,16 +670,7 @@ env_setProperty(JSContext* cx, HandleObject obj, HandleId id, MutableHandleValue
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
rv = putenv(waste);
|
rv = putenv(waste);
|
||||||
#ifdef XP_WIN
|
|
||||||
/*
|
|
||||||
* HPUX9 at least still has the bad old non-copying putenv.
|
|
||||||
*
|
|
||||||
* Per mail from <s.shanmuganathan@digital.com>, OSF1 also has a putenv
|
|
||||||
* that will crash if you pass it an auto char array (so it must place
|
|
||||||
* its argument directly in the char* environ[] array).
|
|
||||||
*/
|
|
||||||
free(waste);
|
free(waste);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
rv = setenv(name.ptr(), value.ptr(), 1);
|
rv = setenv(name.ptr(), value.ptr(), 1);
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,6 @@ public:
|
||||||
static void InitGlobalObjects();
|
static void InitGlobalObjects();
|
||||||
static void ShutdownGlobalObjects();
|
static void ShutdownGlobalObjects();
|
||||||
|
|
||||||
public: /* internal -- HPUX compiler can't handle this being private */
|
|
||||||
//
|
//
|
||||||
// location and length of an url segment relative to mSpec
|
// location and length of an url segment relative to mSpec
|
||||||
//
|
//
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue