summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2007-11-26 18:17:17 +0000
committerwtc%google.com <devnull@localhost>2007-11-26 18:17:17 +0000
commite5a0cd1751a339d044e06a2e227180c9d464373e (patch)
tree437ad9a56a58e6e7f07b25c85b80ffc4e2cdd562
parent889e7a4a0d2fa17a33035c8b9bce70c8a7ebb811 (diff)
downloadnspr-hg-e5a0cd1751a339d044e06a2e227180c9d464373e.tar.gz
Bug 404272: define HAVE_LONG_LONG only if it is not yet defined.
HAVE_LONG_LONG may be defined by the build system of a project using NSPR. The patch is contributed by Edwin van Vliet <edwin@cheatah.nl>. r=wtc Modified Files: _aix32.cfg _aix64.cfg _beos.cfg _bsdi.cfg _darwin.cfg _dgux.cfg _freebsd.cfg _hpux32.cfg _hpux64.cfg _irix32.cfg _irix64.cfg _linux.cfg _netbsd.cfg _nto.cfg _openbsd.cfg _openvms.cfg _os2.cfg _osf1.cfg _riscos.cfg _solaris.cfg _unixware7.cfg _win95.cfg _winnt.cfg
Diffstat
-rw-r--r--pr/include/md/_aix32.cfg2
-rw-r--r--pr/include/md/_aix64.cfg2
-rw-r--r--pr/include/md/_beos.cfg2
-rw-r--r--pr/include/md/_bsdi.cfg4
-rw-r--r--pr/include/md/_darwin.cfg2
-rw-r--r--pr/include/md/_dgux.cfg2
-rw-r--r--pr/include/md/_freebsd.cfg9
-rw-r--r--pr/include/md/_hpux32.cfg2
-rw-r--r--pr/include/md/_hpux64.cfg2
-rw-r--r--pr/include/md/_irix32.cfg2
-rw-r--r--pr/include/md/_irix64.cfg2
-rw-r--r--pr/include/md/_linux.cfg2
-rw-r--r--pr/include/md/_netbsd.cfg8
-rw-r--r--pr/include/md/_nto.cfg2
-rw-r--r--pr/include/md/_openbsd.cfg10
-rw-r--r--pr/include/md/_openvms.cfg2
-rw-r--r--pr/include/md/_os2.cfg2
-rw-r--r--pr/include/md/_osf1.cfg2
-rw-r--r--pr/include/md/_riscos.cfg2
-rw-r--r--pr/include/md/_solaris.cfg2
-rw-r--r--pr/include/md/_unixware7.cfg2
-rw-r--r--pr/include/md/_win95.cfg2
-rw-r--r--pr/include/md/_winnt.cfg2
23 files changed, 54 insertions, 15 deletions
diff --git a/pr/include/md/_aix32.cfg b/pr/include/md/_aix32.cfg
index 1949862a..6b75e4f6 100644
--- a/pr/include/md/_aix32.cfg
+++ b/pr/include/md/_aix32.cfg
@@ -88,7 +88,9 @@
#define PR_ALIGN_OF_DOUBLE 4
#define PR_ALIGN_OF_POINTER 4
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_aix64.cfg b/pr/include/md/_aix64.cfg
index e2c9dc42..8b500ab0 100644
--- a/pr/include/md/_aix64.cfg
+++ b/pr/include/md/_aix64.cfg
@@ -89,7 +89,9 @@
#define PR_ALIGN_OF_DOUBLE 4
#define PR_ALIGN_OF_POINTER 8
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_beos.cfg b/pr/include/md/_beos.cfg
index e1a4d313..557252f3 100644
--- a/pr/include/md/_beos.cfg
+++ b/pr/include/md/_beos.cfg
@@ -95,7 +95,9 @@
#define PR_ALIGN_OF_DOUBLE 4
#define PR_ALIGN_OF_POINTER 4
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
/*
* XXX These two macros need to be investigated for different architectures.
*/
diff --git a/pr/include/md/_bsdi.cfg b/pr/include/md/_bsdi.cfg
index 843f35f6..eb933c14 100644
--- a/pr/include/md/_bsdi.cfg
+++ b/pr/include/md/_bsdi.cfg
@@ -52,7 +52,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
@@ -100,7 +102,9 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_darwin.cfg b/pr/include/md/_darwin.cfg
index dc7e0e0c..baa57958 100644
--- a/pr/include/md/_darwin.cfg
+++ b/pr/include/md/_darwin.cfg
@@ -52,7 +52,9 @@
#define IS_BIG_ENDIAN 1
#endif
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS 1
diff --git a/pr/include/md/_dgux.cfg b/pr/include/md/_dgux.cfg
index ed6b93f8..4db8ec49 100644
--- a/pr/include/md/_dgux.cfg
+++ b/pr/include/md/_dgux.cfg
@@ -48,7 +48,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_freebsd.cfg b/pr/include/md/_freebsd.cfg
index d4e09ec1..76d35420 100644
--- a/pr/include/md/_freebsd.cfg
+++ b/pr/include/md/_freebsd.cfg
@@ -48,11 +48,14 @@
#define PR_AF_INET6 28 /* same as AF_INET6 */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG
+#endif
+
#if defined(__i386__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
@@ -98,7 +101,6 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -145,7 +147,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -192,7 +193,6 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -240,7 +240,6 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
diff --git a/pr/include/md/_hpux32.cfg b/pr/include/md/_hpux32.cfg
index 1213802d..d79b1a9f 100644
--- a/pr/include/md/_hpux32.cfg
+++ b/pr/include/md/_hpux32.cfg
@@ -90,7 +90,9 @@
#define PR_ALIGN_OF_DOUBLE 8
#define PR_ALIGN_OF_POINTER 4
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_hpux64.cfg b/pr/include/md/_hpux64.cfg
index 17574ade..f1f829d1 100644
--- a/pr/include/md/_hpux64.cfg
+++ b/pr/include/md/_hpux64.cfg
@@ -91,7 +91,9 @@
#define PR_ALIGN_OF_DOUBLE 8
#define PR_ALIGN_OF_POINTER 8
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_irix32.cfg b/pr/include/md/_irix32.cfg
index db6ca446..88e0ceed 100644
--- a/pr/include/md/_irix32.cfg
+++ b/pr/include/md/_irix32.cfg
@@ -95,7 +95,9 @@
#define PR_ALIGN_OF_POINTER 4
#define PR_ALIGN_OF_WORD 4
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_irix64.cfg b/pr/include/md/_irix64.cfg
index 305317ea..ba51eca3 100644
--- a/pr/include/md/_irix64.cfg
+++ b/pr/include/md/_irix64.cfg
@@ -96,7 +96,9 @@
#define PR_ALIGN_OF_POINTER 4
#define PR_ALIGN_OF_WORD 4
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index 7c5472f2..d02ab21f 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -660,7 +660,9 @@
#endif
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#if PR_ALIGN_OF_DOUBLE == 8
#define HAVE_ALIGNED_DOUBLES
#endif
diff --git a/pr/include/md/_netbsd.cfg b/pr/include/md/_netbsd.cfg
index 6a36bb16..cb4e6262 100644
--- a/pr/include/md/_netbsd.cfg
+++ b/pr/include/md/_netbsd.cfg
@@ -48,11 +48,14 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG
+#endif
+
#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
@@ -98,7 +101,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
@@ -143,7 +145,6 @@
#elif defined(__alpha__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -191,7 +192,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_nto.cfg b/pr/include/md/_nto.cfg
index 76635729..b664b7f9 100644
--- a/pr/include/md/_nto.cfg
+++ b/pr/include/md/_nto.cfg
@@ -100,7 +100,9 @@
#endif
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#ifndef NO_NSPR_10_SUPPORT
diff --git a/pr/include/md/_openbsd.cfg b/pr/include/md/_openbsd.cfg
index e133d9f5..dbd7b545 100644
--- a/pr/include/md/_openbsd.cfg
+++ b/pr/include/md/_openbsd.cfg
@@ -48,11 +48,14 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG
+#endif
+
#if defined(__i386__) || defined(__arm__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
@@ -140,7 +143,6 @@
#define PR_BYTES_PER_WORD_LOG2 3
#define PR_BYTES_PER_DWORD_LOG2 3
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
@@ -148,7 +150,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -196,7 +197,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
@@ -241,7 +241,6 @@
#elif defined(__alpha__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
-#define HAVE_LONG_LONG
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#define IS_64
@@ -289,7 +288,6 @@
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
-#define HAVE_LONG_LONG
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_openvms.cfg b/pr/include/md/_openvms.cfg
index 84c2a9d4..ee8a446a 100644
--- a/pr/include/md/_openvms.cfg
+++ b/pr/include/md/_openvms.cfg
@@ -48,7 +48,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#ifdef IS_64
diff --git a/pr/include/md/_os2.cfg b/pr/include/md/_os2.cfg
index 55bcf93b..950f8ed4 100644
--- a/pr/include/md/_os2.cfg
+++ b/pr/include/md/_os2.cfg
@@ -55,8 +55,10 @@
#ifdef NO_LONG_LONG
#undef HAVE_LONG_LONG
#else
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG 1
#endif
+#endif
#define PR_AF_INET6 24 /* same as AF_INET6 */
diff --git a/pr/include/md/_osf1.cfg b/pr/include/md/_osf1.cfg
index ac07b57c..dcd8d308 100644
--- a/pr/include/md/_osf1.cfg
+++ b/pr/include/md/_osf1.cfg
@@ -48,7 +48,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
#ifndef IS_64
diff --git a/pr/include/md/_riscos.cfg b/pr/include/md/_riscos.cfg
index 86b88eb5..53010bda 100644
--- a/pr/include/md/_riscos.cfg
+++ b/pr/include/md/_riscos.cfg
@@ -48,7 +48,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_solaris.cfg b/pr/include/md/_solaris.cfg
index 4dc02946..81313e55 100644
--- a/pr/include/md/_solaris.cfg
+++ b/pr/include/md/_solaris.cfg
@@ -149,7 +149,9 @@
#endif /* IS_64 */
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#define HAVE_ALIGNED_DOUBLES
#define HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_unixware7.cfg b/pr/include/md/_unixware7.cfg
index c37bd3c9..6444b00b 100644
--- a/pr/include/md/_unixware7.cfg
+++ b/pr/include/md/_unixware7.cfg
@@ -48,7 +48,9 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#undef HAVE_ALIGNED_DOUBLES
#undef HAVE_ALIGNED_LONGLONGS
diff --git a/pr/include/md/_win95.cfg b/pr/include/md/_win95.cfg
index de25ce24..026258b8 100644
--- a/pr/include/md/_win95.cfg
+++ b/pr/include/md/_win95.cfg
@@ -248,7 +248,9 @@
#endif /* defined(_M_IX86) || defined(_X86_) */
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#ifndef NO_NSPR_10_SUPPORT
diff --git a/pr/include/md/_winnt.cfg b/pr/include/md/_winnt.cfg
index fb71b8a9..d1d32bb8 100644
--- a/pr/include/md/_winnt.cfg
+++ b/pr/include/md/_winnt.cfg
@@ -248,7 +248,9 @@
#endif /* defined(_M_IX86) || defined(_X86_) */
+#ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG
+#endif
#ifndef NO_NSPR_10_SUPPORT
View Lorry Controller Status