70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
|
--- ./configure.in.sparc 2008-09-30 13:15:07.000000000 -0400
|
||
|
|
+++ ./configure.in 2008-09-30 13:17:36.000000000 -0400
|
||
|
|
@@ -1079,7 +1079,11 @@ Alpha | alpha | ALPHA)
|
||
|
|
CPU_ARCH=Alpha
|
||
|
|
;;
|
||
|
|
|
||
|
|
-x86_64 | sparc | ppc | ia64)
|
||
|
|
+sun4u | sparc*)
|
||
|
|
+ CPU_ARCH=sparc
|
||
|
|
+ ;;
|
||
|
|
+
|
||
|
|
+x86_64 | ia64)
|
||
|
|
CPU_ARCH="$CPU_ARCH_TEST"
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
@@ -1117,7 +1121,11 @@ if test "$GNU_CC"; then
|
||
|
|
# -Wbad-function-cast - warns when casting a function to a new return type
|
||
|
|
# -Wconversion - complained when char's or short's were used a function args
|
||
|
|
# -Wshadow - removed because it generates more noise than help --pete
|
||
|
|
- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith -Wcast-align"
|
||
|
|
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -W -Wno-unused -Wpointer-arith"
|
||
|
|
+ if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
|
||
|
|
+ # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
|
||
|
|
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wcast-align"
|
||
|
|
+ fi
|
||
|
|
|
||
|
|
dnl Turn pedantic on but disable the warnings for long long
|
||
|
|
_PEDANTIC=1
|
||
|
|
@@ -1136,7 +1144,11 @@ fi
|
||
|
|
|
||
|
|
if test "$GNU_CXX"; then
|
||
|
|
# Turn on GNU specific features
|
||
|
|
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
|
||
|
|
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
|
||
|
|
+ if test "$CPU_ARCH" != "ia64" && test "$CPU_ARCH" != "sparc"; then
|
||
|
|
+ # don't use -Wcast-align on ia64 or sparc, it's noisy on those platforms
|
||
|
|
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wcast-align"
|
||
|
|
+ fi
|
||
|
|
|
||
|
|
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
|
||
|
|
_USE_CPP_INCLUDE_FLAG=1
|
||
|
|
--- ./modules/oji/public/nsIJVMPlugin.h.sparc 2008-09-30 13:13:01.000000000 -0400
|
||
|
|
+++ ./modules/oji/public/nsIJVMPlugin.h 2008-09-30 13:13:57.000000000 -0400
|
||
|
|
@@ -51,6 +51,7 @@
|
||
|
|
#include "nsISupports.h"
|
||
|
|
#include "nsIPrincipal.h"
|
||
|
|
#include "jni.h"
|
||
|
|
+#include "jstypes.h"
|
||
|
|
|
||
|
|
class nsISecureEnv;
|
||
|
|
|
||
|
|
@@ -90,7 +91,7 @@ public:
|
||
|
|
GetClassPath(const char* *result) = 0;
|
||
|
|
|
||
|
|
NS_IMETHOD
|
||
|
|
-#if PR_BYTES_PER_LONG == 8
|
||
|
|
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
|
||
|
|
GetJavaWrapper(JNIEnv* jenv, jlong obj, jobject *jobj) = 0;
|
||
|
|
#else
|
||
|
|
GetJavaWrapper(JNIEnv* jenv, jint obj, jobject *jobj) = 0;
|
||
|
|
@@ -114,7 +115,7 @@ public:
|
||
|
|
SpendTime(PRUint32 timeMillis) = 0;
|
||
|
|
|
||
|
|
NS_IMETHOD
|
||
|
|
-#if PR_BYTES_PER_LONG == 8
|
||
|
|
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
|
||
|
|
UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jlong* obj) = 0;
|
||
|
|
#else
|
||
|
|
UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jint* obj) = 0;
|