diff options
| author | Bruce Momjian | 2002-04-24 01:56:20 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2002-04-24 01:56:20 +0000 |
| commit | 2d81019493541d90f601ffb6f1f2cc9841b7aefe (patch) | |
| tree | e88e38846a6f4b03aafe3b9a6d7ee9f58067bc92 /src | |
| parent | d37134085bccedea456367c3e4bce02268d61be3 (diff) | |
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.1
Nicolas Bazin
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/odbc/convert.c | 6 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index a2e2ee8c778..39998cc0c57 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 918538c95e7..0c348ddeddc 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;; |