diff --git a/configure b/configure
index 5195e197112f940068b70acb4edb13449412ab03..6cc92cb3b12862e208d5d99d8ef89a4d9be03366 100755
--- a/configure
+++ b/configure
@@ -5375,13 +5375,13 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
+echo "$as_me:$LINENO: checking for main in -lnsl" >&5
+echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
+LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -5413,34 +5413,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_socket_main=yes
+ ac_cv_lib_nsl_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-ac_cv_lib_socket_main=no
+ac_cv_lib_nsl_main=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
+if test $ac_cv_lib_nsl_main = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
+#define HAVE_LIBNSL 1
_ACEOF
- LIBS="-lsocket $LIBS"
+ LIBS="-lnsl $LIBS"
fi
-echo "$as_me:$LINENO: checking for main in -lnsl" >&5
-echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_main+set}" = set; then
+echo "$as_me:$LINENO: checking for main in -lsocket" >&5
+echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
+LIBS="-lsocket $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -5472,23 +5472,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_nsl_main=yes
+ ac_cv_lib_socket_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-ac_cv_lib_nsl_main=no
+ac_cv_lib_socket_main=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
-if test $ac_cv_lib_nsl_main = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
+if test $ac_cv_lib_socket_main = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
+#define HAVE_LIBSOCKET 1
_ACEOF
- LIBS="-lnsl $LIBS"
+ LIBS="-lsocket $LIBS"
fi
diff --git a/configure.in b/configure.in
index b592e4c5b3bf05fb7d24a30e9b9580054be8634f..d3d53ee095ced97501e994acd6e92445661a9a1f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.180 2002/04/21 19:54:50 thomas Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.181 2002/04/24 01:56:20 momjian Exp $
dnl Developers, please strive to achieve this order:
dnl
@@ -705,8 +705,8 @@ fi
AC_CHECK_LIB(util, setproctitle)
AC_CHECK_LIB(m, main)
AC_CHECK_LIB(dl, main)
-AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(nsl, main)
+AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(ipc, main)
AC_CHECK_LIB(IPC, main)
AC_CHECK_LIB(lc, main)
diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c
index a2e2ee8c778b78b9780eeda18bc34c05359d1e50..39998cc0c5737021b0b70f14073fcbe77e90d25c 100644
--- a/src/interfaces/odbc/convert.c
+++ b/src/interfaces/odbc/convert.c
@@ -2720,7 +2720,7 @@ conv_from_octal(const unsigned char *s)
y = 0;
for (i = 1; i <= 3; i++)
- y += (s[i] - 48) * (int) pow(8, 3 - i);
+ y += (s[i] - '0') << (3 * (3 - i));
return y;
@@ -2743,7 +2743,7 @@ conv_from_hex(const unsigned char *s)
else
val = s[i] - '0';
- y += val * (int) pow(16, 2 - i);
+ y += val << (4 * (2 - i));
}
return y;
@@ -2798,7 +2798,7 @@ conv_to_octal(unsigned char val)
for (i = 4; i > 1; i--)
{
- x[i] = (val & 7) + 48;
+ x[i] = (val & 7) + '0';
val >>= 3;
}
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
index 918538c95e731667716d27a8862518fdde923b77..0c348ddeddc95b7ad2cf9b7d674ffe94b9d2df65 100644
--- a/src/test/regress/pg_regress.sh
+++ b/src/test/regress/pg_regress.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.23 2002/01/03 21:52:05 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.24 2002/04/24 01:56:20 momjian Exp $
me=`basename $0`
: ${TMPDIR=/tmp}
@@ -173,7 +173,7 @@ esac
# ----------
case $host_platform in
- *-*-qnx*)
+ *-*-qnx* | *-*-sco3.2v5*)
DIFFFLAGS=-b;;
*)
DIFFFLAGS=-w;;