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

nsprpub/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
 

nsprpub/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
 

nsprpub/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.
  */

nsprpub/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
 

nsprpub/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
 

nsprpub/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
 

nsprpub/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

nsprpub/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
 

nsprpub/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
 

nsprpub/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
 

nsprpub/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
 

nsprpub/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

nsprpub/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
 

nsprpub/pr/include/md/_nto.cfg

@@ -100,7 +100,9 @@
 
 #endif
 
+#ifndef HAVE_LONG_LONG
 #define HAVE_LONG_LONG
+#endif
 
 #ifndef NO_NSPR_10_SUPPORT
 

nsprpub/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
 

nsprpub/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

nsprpub/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 */
 

nsprpub/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

nsprpub/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
 

nsprpub/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
 

nsprpub/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
 

nsprpub/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
 

nsprpub/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