Bugzilla bug #26520: define PR_AF_INET6 to have the same value as

AF_INET6 in prcpucfg.h if AF_INET6 is defined on the platform.
Otherwise, define PR_AF_INET6 to be 100 in prio.h.
Modified files: prio.h, _aix32.cfg, _aix32in6.cfg, _aix64.cfg,
_hpux32.cfg, _hpux64.cfg, _irix32.cfg, _irix64.cfg, _linux.cfg,
_osf1.cfg, _solaris32.cfg, _solaris64.cfg, _unixware7.cfg,
_win95.cfg, _winnt.cfg
(NSPRPUB_RELEASE_4_0_BRANCH)

15 files changed, 34 insertions, 0 deletions

diff --git a/pr/include/md/_aix32.cfg b/pr/include/md/_aix32.cfg
index c1267e23..2fca5190 100644
--- a/pr/include/md/_aix32.cfg
+++ b/pr/include/md/_aix32.cfg
@@ -73,6 +73,8 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #ifndef NO_NSPR_10_SUPPORT
 
 #define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
diff --git a/pr/include/md/_aix32in6.cfg b/pr/include/md/_aix32in6.cfg
index bc9458c6..0385e86a 100644
--- a/pr/include/md/_aix32in6.cfg
+++ b/pr/include/md/_aix32in6.cfg
@@ -76,6 +76,7 @@
 #ifndef _PR_INET6
 #define _PR_INET6
 #endif
+#define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
 
diff --git a/pr/include/md/_aix64.cfg b/pr/include/md/_aix64.cfg
index b8e3e884..59bb1a79 100644
--- a/pr/include/md/_aix64.cfg
+++ b/pr/include/md/_aix64.cfg
@@ -77,6 +77,7 @@
 #ifndef _PR_INET6
 #define _PR_INET6
 #endif
+#define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
 
diff --git a/pr/include/md/_hpux32.cfg b/pr/include/md/_hpux32.cfg
index 1afc14a4..85ff9476 100644
--- a/pr/include/md/_hpux32.cfg
+++ b/pr/include/md/_hpux32.cfg
@@ -30,6 +30,8 @@
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
 
+#define PR_AF_INET6 22  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_hpux64.cfg b/pr/include/md/_hpux64.cfg
index d2b626e2..3450f7fa 100644
--- a/pr/include/md/_hpux64.cfg
+++ b/pr/include/md/_hpux64.cfg
@@ -31,6 +31,8 @@
 #define IS_BIG_ENDIAN 1
 #define IS_64
 
+#define PR_AF_INET6 22  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_irix32.cfg b/pr/include/md/_irix32.cfg
index f791faf8..ee6fc686 100644
--- a/pr/include/md/_irix32.cfg
+++ b/pr/include/md/_irix32.cfg
@@ -34,6 +34,8 @@
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_irix64.cfg b/pr/include/md/_irix64.cfg
index 7e988172..ddc4305c 100644
--- a/pr/include/md/_irix64.cfg
+++ b/pr/include/md/_irix64.cfg
@@ -35,6 +35,8 @@
 #define IS_BIG_ENDIAN 1
 #define IS_64
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index aa99901c..33fa2683 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -27,6 +27,8 @@
 #define LINUX
 #endif
 
+#define PR_AF_INET6 10  /* same as AF_INET6 */
+
 #ifdef __powerpc__
 
 #undef  IS_LITTLE_ENDIAN
diff --git a/pr/include/md/_osf1.cfg b/pr/include/md/_osf1.cfg
index 576af82b..e01e9df5 100644
--- a/pr/include/md/_osf1.cfg
+++ b/pr/include/md/_osf1.cfg
@@ -36,6 +36,8 @@
 #define IS_64
 #endif
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_solaris32.cfg b/pr/include/md/_solaris32.cfg
index f6b988a1..e4c9a9fe 100644
--- a/pr/include/md/_solaris32.cfg
+++ b/pr/include/md/_solaris32.cfg
@@ -41,6 +41,8 @@
 #error unknown processor
 #endif
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_solaris64.cfg b/pr/include/md/_solaris64.cfg
index 40832724..b302961b 100644
--- a/pr/include/md/_solaris64.cfg
+++ b/pr/include/md/_solaris64.cfg
@@ -42,6 +42,8 @@
 #endif
 #define IS_64
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_unixware7.cfg b/pr/include/md/_unixware7.cfg
index 3e50f662..855500c1 100644
--- a/pr/include/md/_unixware7.cfg
+++ b/pr/include/md/_unixware7.cfg
@@ -33,6 +33,8 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
+#define PR_AF_INET6 27  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_win95.cfg b/pr/include/md/_win95.cfg
index af9e0d11..318422f1 100644
--- a/pr/include/md/_win95.cfg
+++ b/pr/include/md/_win95.cfg
@@ -31,6 +31,8 @@
 #define WIN95
 #endif
 
+#define PR_AF_INET6 23  /* same as AF_INET6 */
+
 #if defined(_M_IX86) || defined(_X86_)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_winnt.cfg b/pr/include/md/_winnt.cfg
index e3348445..76147e01 100644
--- a/pr/include/md/_winnt.cfg
+++ b/pr/include/md/_winnt.cfg
@@ -31,6 +31,8 @@
 #define WINNT
 #endif
 
+#define PR_AF_INET6 23  /* same as AF_INET6 */
+
 #if defined(_M_IX86) || defined(_X86_)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/prio.h b/pr/include/prio.h
index 45baed03..8d629c4b 100644
--- a/pr/include/prio.h
+++ b/pr/include/prio.h
@@ -110,7 +110,15 @@ typedef enum PRTransmitFileFlags {
 
 #endif /* WIN32 */
 
+/*
+** Define PR_AF_INET6 in prcpucfg.h with the same
+** value as AF_INET6 on platforms with IPv6 support.
+** Otherwise define it here.
+*/
+#ifndef PR_AF_INET6
 #define PR_AF_INET6 100
+#endif
+
 /*
 **************************************************************************
 ** A network address