Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2d81019

Browse files
committed
Sorry for the package, but the following patch need to be applied to get
the new verion compiled on SCO Openserver 5.0.5 and Unixware 7.1.1Nicolas Bazin
1 parentd371340 commit2d81019

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎configure‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5375,13 +5375,13 @@ _ACEOF
53755375
fi
53765376
53775377
5378-
echo"$as_me:$LINENO: checking for main in -lsocket">&5
5379-
echo$ECHO_N"checking for main in -lsocket...$ECHO_C">&6
5380-
iftest"${ac_cv_lib_socket_main+set}" =set;then
5378+
echo"$as_me:$LINENO: checking for main in -lnsl">&5
5379+
echo$ECHO_N"checking for main in -lnsl...$ECHO_C">&6
5380+
iftest"${ac_cv_lib_nsl_main+set}" =set;then
53815381
echo$ECHO_N"(cached)$ECHO_C">&6
53825382
else
53835383
ac_check_lib_save_LIBS=$LIBS
5384-
LIBS="-lsocket$LIBS"
5384+
LIBS="-lnsl$LIBS"
53855385
cat>conftest.$ac_ext<<_ACEOF
53865386
#line$LINENO "configure"
53875387
#include "confdefs.h"
@@ -5413,34 +5413,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
54135413
ac_status=$?
54145414
echo"$as_me:$LINENO:\$? =$ac_status">&5
54155415
(exit$ac_status); }; };then
5416-
ac_cv_lib_socket_main=yes
5416+
ac_cv_lib_nsl_main=yes
54175417
else
54185418
echo"$as_me: failed program was:">&5
54195419
cat conftest.$ac_ext>&5
5420-
ac_cv_lib_socket_main=no
5420+
ac_cv_lib_nsl_main=no
54215421
fi
54225422
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
54235423
LIBS=$ac_check_lib_save_LIBS
54245424
fi
5425-
echo"$as_me:$LINENO: result:$ac_cv_lib_socket_main">&5
5426-
echo"${ECHO_T}$ac_cv_lib_socket_main">&6
5427-
iftest$ac_cv_lib_socket_main = yes;then
5425+
echo"$as_me:$LINENO: result:$ac_cv_lib_nsl_main">&5
5426+
echo"${ECHO_T}$ac_cv_lib_nsl_main">&6
5427+
iftest$ac_cv_lib_nsl_main = yes;then
54285428
cat>>confdefs.h<<_ACEOF
5429-
#defineHAVE_LIBSOCKET 1
5429+
#defineHAVE_LIBNSL 1
54305430
_ACEOF
54315431
5432-
LIBS="-lsocket$LIBS"
5432+
LIBS="-lnsl$LIBS"
54335433
54345434
fi
54355435
54365436
5437-
echo"$as_me:$LINENO: checking for main in -lnsl">&5
5438-
echo$ECHO_N"checking for main in -lnsl...$ECHO_C">&6
5439-
iftest"${ac_cv_lib_nsl_main+set}" =set;then
5437+
echo"$as_me:$LINENO: checking for main in -lsocket">&5
5438+
echo$ECHO_N"checking for main in -lsocket...$ECHO_C">&6
5439+
iftest"${ac_cv_lib_socket_main+set}" =set;then
54405440
echo$ECHO_N"(cached)$ECHO_C">&6
54415441
else
54425442
ac_check_lib_save_LIBS=$LIBS
5443-
LIBS="-lnsl$LIBS"
5443+
LIBS="-lsocket$LIBS"
54445444
cat>conftest.$ac_ext<<_ACEOF
54455445
#line$LINENO "configure"
54465446
#include "confdefs.h"
@@ -5472,23 +5472,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
54725472
ac_status=$?
54735473
echo"$as_me:$LINENO:\$? =$ac_status">&5
54745474
(exit$ac_status); }; };then
5475-
ac_cv_lib_nsl_main=yes
5475+
ac_cv_lib_socket_main=yes
54765476
else
54775477
echo"$as_me: failed program was:">&5
54785478
cat conftest.$ac_ext>&5
5479-
ac_cv_lib_nsl_main=no
5479+
ac_cv_lib_socket_main=no
54805480
fi
54815481
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
54825482
LIBS=$ac_check_lib_save_LIBS
54835483
fi
5484-
echo"$as_me:$LINENO: result:$ac_cv_lib_nsl_main">&5
5485-
echo"${ECHO_T}$ac_cv_lib_nsl_main">&6
5486-
iftest$ac_cv_lib_nsl_main = yes;then
5484+
echo"$as_me:$LINENO: result:$ac_cv_lib_socket_main">&5
5485+
echo"${ECHO_T}$ac_cv_lib_socket_main">&6
5486+
iftest$ac_cv_lib_socket_main = yes;then
54875487
cat>>confdefs.h<<_ACEOF
5488-
#defineHAVE_LIBNSL 1
5488+
#defineHAVE_LIBSOCKET 1
54895489
_ACEOF
54905490
5491-
LIBS="-lnsl$LIBS"
5491+
LIBS="-lsocket$LIBS"
54925492
54935493
fi
54945494

‎configure.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.180 2002/04/21 19:54:50 thomas Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.181 2002/04/24 01:56:20 momjian Exp $
33

44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -705,8 +705,8 @@ fi
705705
AC_CHECK_LIB(util, setproctitle)
706706
AC_CHECK_LIB(m, main)
707707
AC_CHECK_LIB(dl, main)
708-
AC_CHECK_LIB(socket, main)
709708
AC_CHECK_LIB(nsl, main)
709+
AC_CHECK_LIB(socket, main)
710710
AC_CHECK_LIB(ipc, main)
711711
AC_CHECK_LIB(IPC, main)
712712
AC_CHECK_LIB(lc, main)

‎src/interfaces/odbc/convert.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,7 +2720,7 @@ conv_from_octal(const unsigned char *s)
27202720
y=0;
27212721

27222722
for (i=1;i <=3;i++)
2723-
y+= (s[i]-48)* (int)pow(8,3-i);
2723+
y+= (s[i]-'0') << (3* (3-i));
27242724

27252725
returny;
27262726

@@ -2743,7 +2743,7 @@ conv_from_hex(const unsigned char *s)
27432743
else
27442744
val=s[i]-'0';
27452745

2746-
y+=val* (int)pow(16,2-i);
2746+
y+=val<< (4* (2-i));
27472747
}
27482748

27492749
returny;
@@ -2798,7 +2798,7 @@ conv_to_octal(unsigned char val)
27982798

27992799
for (i=4;i>1;i--)
28002800
{
2801-
x[i]= (val&7)+48;
2801+
x[i]= (val&7)+'0';
28022802
val >>=3;
28032803
}
28042804

‎src/test/regress/pg_regress.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.23 2002/01/03 21:52:05 tgl Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.24 2002/04/24 01:56:20 momjian Exp $
33

44
me=`basename$0`
55
:${TMPDIR=/tmp}
@@ -173,7 +173,7 @@ esac
173173
# ----------
174174

175175
case$host_platformin
176-
*-*-qnx*)
176+
*-*-qnx* |*-*-sco3.2v5*)
177177
DIFFFLAGS=-b;;
178178
*)
179179
DIFFFLAGS=-w;;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp