1930. [port] HPUX: ia64 support. [RT #15473]

1929.   [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.

diff --git a/configure b/configure
index 20225214ec1816bf6cdd053edae1c2068d584388..462cffba4e71521c490e728f973258fbfe0e8319 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.294.2.51 .
+# From configure.in Revision: 1.294.2.52 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -6391,7 +6391,14 @@ _ACEOF
 fi
 
                        case $host in
-                       *-freebsd5.3|*-freebsd5.3.*)
+                       *-freebsd5.[012]|*-freebsd5.[012].*);;
+                       *-freebsd5.[3456789]|*-freebsd5.[3456789].*)
+                               cat >>confdefs.h <<\_ACEOF
+#define NEED_PTHREAD_SCOPE_SYSTEM 1
+_ACEOF
+
+                               ;;
+                       *-freebsd6.*)
                                cat >>confdefs.h <<\_ACEOF
 #define NEED_PTHREAD_SCOPE_SYSTEM 1
 _ACEOF
@@ -7018,7 +7025,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"
@@ -7963,7 +7970,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7966 "configure"' > conftest.$ac_ext
+  echo '#line 7973 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8960,7 +8967,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:8963:" \
+echo "$as_me:8970:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -10021,11 +10028,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10024: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10031: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10028: \$? = $ac_status" >&5
+   echo "$as_me:10035: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10264,11 +10271,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10267: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10274: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10271: \$? = $ac_status" >&5
+   echo "$as_me:10278: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10324,11 +10331,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10327: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10331: \$? = $ac_status" >&5
+   echo "$as_me:10338: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12509,7 +12516,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12512 "configure"
+#line 12519 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12607,7 +12614,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12610 "configure"
+#line 12617 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14804,11 +14811,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14807: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14814: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14811: \$? = $ac_status" >&5
+   echo "$as_me:14818: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14864,11 +14871,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14867: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14874: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14871: \$? = $ac_status" >&5
+   echo "$as_me:14878: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16225,7 +16232,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16228 "configure"
+#line 16235 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16323,7 +16330,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16326 "configure"
+#line 16333 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17160,11 +17167,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17170: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17167: \$? = $ac_status" >&5
+   echo "$as_me:17174: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17220,11 +17227,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17223: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17227: \$? = $ac_status" >&5
+   echo "$as_me:17234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19259,11 +19266,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19262: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19269: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19266: \$? = $ac_status" >&5
+   echo "$as_me:19273: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19502,11 +19509,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19505: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19512: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19509: \$? = $ac_status" >&5
+   echo "$as_me:19516: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19562,11 +19569,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19565: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19572: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19569: \$? = $ac_status" >&5
+   echo "$as_me:19576: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21747,7 +21754,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21750 "configure"
+#line 21757 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21845,7 +21852,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21848 "configure"
+#line 21855 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/lib/bind/configure b/lib/bind/configure
index e3002a386a47ff0d0c84a551db954178a44d4017..f7b9b452050fb8743f647cb5b8a63e672a90cf94 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.83.2.26 .
+# From configure.in Revision: 1.83.2.27 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 30a781b7b33b6fec6b97748021c4d984cace4987..a19e339fa036241139197decf2a9d38592a48f65 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.181.2.20 2005/03/16 00:57:42 marka Exp $ */
+/* $Id: adb.c,v 1.181.2.21 2005/10/14 01:37:53 marka Exp $ */
 
 /*
  * Implementation notes
@@ -1994,7 +1994,7 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) {
 static isc_boolean_t
 check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) {
        dns_adbname_t *name;
-       isc_result_t result = ISC_FALSE;
+       isc_boolean_t result = ISC_FALSE;
 
        INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep));
        name = *namep;
@@ -3957,7 +3957,7 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, dns_name_t *zone,
  unlock:
        UNLOCK(&adb->entrylocks[bucket]);
 
-       return (ISC_R_SUCCESS);
+       return (result);
 }
 
 void

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 35b37379fe2c3ab8075d27f3eb90a1704e96bc65..3e575355838ad595a8117b543497286b3544450b 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.7 2004/10/13 22:28:04 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.8 2005/10/14 01:37:55 marka Exp $ */
 
 #include <config.h>
 
@@ -233,7 +233,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
      ISC_FORMAT_PRINTF(5, 6);
 
 static void
-xfrin_log(dns_xfrin_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...)
      ISC_FORMAT_PRINTF(3, 4);
 
 /**************************************************************************/
@@ -1374,7 +1374,7 @@ xfrin_log1(int level, dns_name_t *zonename, dns_rdataclass_t rdclass,
  */
 
 static void
-xfrin_log(dns_xfrin_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...)
 {
        va_list ap;
 

diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index 3b3776520c9cbfbb126d4a278e41744c4b57767c..32892e55c76f5b944cb5118560dadbf244b94758 100644 (file)
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.c,v 1.11.2.3 2004/03/09 06:11:47 marka Exp $ */
+/* $Id: lfsr.c,v 1.11.2.4 2005/10/14 01:37:56 marka Exp $ */
 
 #include <config.h>
 
@@ -55,9 +55,6 @@ isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
 static inline isc_uint32_t
 lfsr_generate(isc_lfsr_t *lfsr)
 {
-       unsigned int highbit;
-
-       highbit = 1 << (lfsr->bits - 1);
 
        /*
         * If the previous state is zero, we must fill it with something

diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index bc9ac24a515bf21a0f4d9424652f1718a0ca7d65..5de2c4d58036606ea1e705ba1847b6925423d8e5 100644 (file)
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.11.2.2 2004/05/18 01:38:39 marka Exp $ */
+/* $Id: os.c,v 1.11.2.3 2005/10/14 01:37:56 marka Exp $ */
 
 #include <config.h>
 
@@ -26,6 +26,7 @@
 
 #include <unistd.h>
 
+#ifndef __hpux
 static inline long
 sysconf_ncpus(void) {
 #if defined(_SC_NPROCESSORS_ONLN)
@@ -36,6 +37,7 @@ sysconf_ncpus(void) {
        return (0);
 #endif
 }
+#endif
 #endif /* HAVE_SYSCONF */
 
 

diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 44c944a04914218ed1b2563dbe98160db037991f..d2d11d047563dd32dd46c4f1eb1d266287322af5 100644 (file)
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.1.6.5 2005/05/08 23:54:55 marka Exp $ */
+/* $Id: print.c,v 1.1.6.6 2005/10/14 01:37:57 marka Exp $ */
 
 #include <config.h>
 
@@ -62,7 +62,6 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
        int left;
        int plus;
        int space;
-       int neg;
        long long tmpi;
        unsigned long long tmpui;
        unsigned long width;
@@ -102,7 +101,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
                /*
                 * Reset flags.
                 */
-               dot = neg = space = plus = left = zero = alt = h = l = q = 0;
+               dot = space = plus = left = zero = alt = h = l = q = 0;
                width = precision = 0;
                head = "";
                length = pad = zeropad = 0;