Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.178
diff -c -r1.178 configure.in
*** configure.in	14 Apr 2002 17:23:20 -0000	1.178
--- configure.in	18 Apr 2002 15:26:08 -0000
***************
*** 696,703 ****
  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(ipc,      main)
  AC_CHECK_LIB(IPC,      main)
  AC_CHECK_LIB(lc,       main)
--- 696,703 ----
  AC_CHECK_LIB(util,     setproctitle)
  AC_CHECK_LIB(m,        main)
  AC_CHECK_LIB(dl,       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)
Index: src/interfaces/odbc/convert.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/odbc/convert.c,v
retrieving revision 1.78
diff -c -r1.78 convert.c
*** src/interfaces/odbc/convert.c	1 Apr 2002 03:01:14 -0000	1.78
--- src/interfaces/odbc/convert.c	18 Apr 2002 15:26:23 -0000
***************
*** 2717,2723 ****
  				y = 0;
  
  	for (i = 1; i <= 3; i++)
! 		y += (s[i] - 48) * (int) pow(8, 3 - i);
  
  	return y;
  
--- 2717,2723 ----
  				y = 0;
  
  	for (i = 1; i <= 3; i++)
! 		y += (s[i] - '0') << (3  * (3 - i));
  
  	return y;
  
***************
*** 2740,2746 ****
  		else
  			val = s[i] - '0';
  
! 		y += val * (int) pow(16, 2 - i);
  	}
  
  	return y;
--- 2740,2746 ----
  		else
  			val = s[i] - '0';
  
! 		y += val << (4 * (2 - i));
  	}
  
  	return y;
***************
*** 2795,2801 ****
  
  	for (i = 4; i > 1; i--)
  	{
! 		x[i] = (val & 7) + 48;
  		val >>= 3;
  	}
  
--- 2795,2801 ----
  
  	for (i = 4; i > 1; i--)
  	{
! 		x[i] = (val & 7) + '0';
  		val >>= 3;
  	}
  
Index: src/test/regress/pg_regress.sh
===================================================================
RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v
retrieving revision 1.23
diff -c -r1.23 pg_regress.sh
*** src/test/regress/pg_regress.sh	3 Jan 2002 21:52:05 -0000	1.23
--- src/test/regress/pg_regress.sh	18 Apr 2002 15:26:24 -0000
***************
*** 173,179 ****
  # ----------
  
  case $host_platform in
!     *-*-qnx*)
          DIFFFLAGS=-b;;
      *)
          DIFFFLAGS=-w;;
--- 173,179 ----
  # ----------
  
  case $host_platform in
!     *-*-qnx* | *-*-sco3.2v5*)
          DIFFFLAGS=-b;;
      *)
          DIFFFLAGS=-w;;