Skip to content

P
Postgres FD Implementation
Commit c3f93719 authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Add configure check for sys_nerr, to end all discussions.

parent af26d6a4
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 71 deletions
config/c-library.m4
View file @ c3f93719
# Macros that test various C library quirks # Macros that test various C library quirks
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.5 2000/11/03 18:43:51 petere Exp $ # $Header: /cvsroot/pgsql/config/c-library.m4,v 1.6 2001/01/09 18:40:13 petere Exp $
# PGAC_VAR_INT_TIMEZONE # PGAC_VAR_INT_TIMEZONE
...@@ -123,3 +123,18 @@ if test x"$pgac_cv_header_strings_both" = x"yes"; then ...@@ -123,3 +123,18 @@ if test x"$pgac_cv_header_strings_both" = x"yes"; then
AC_DEFINE([STRING_H_WITH_STRINGS_H], 1, AC_DEFINE([STRING_H_WITH_STRINGS_H], 1,
[Define if string.h and strings.h may both be included]) [Define if string.h and strings.h may both be included])
fi]) fi])
# PGAC_VAR_SYS_NERR
# -----------------
# Check if the global variable 'sys_nerr' exists. If so, define
# HAVE_SYS_NERR.
AC_DEFUN([PGAC_VAR_SYS_NERR],
[AC_CACHE_CHECK([for sys_nerr], pgac_cv_var_sys_nerr,
[AC_TRY_LINK([extern int sys_nerr;],
[int x = sys_nerr;],
[pgac_cv_var_sys_nerr=yes],
[pgac_cv_var_sys_nerr=no])])
if test x"$pgac_cv_var_sys_nerr" = xyes ; then
AC_DEFINE(HAVE_SYS_NERR,, [Set to 1 if you have the global variable sys_nerr])
fi])# PGAC_VAR_SYS_NERR
configure
View file @ c3f93719
...@@ -6888,10 +6888,42 @@ EOF ...@@ -6888,10 +6888,42 @@ EOF
fi fi
echo $ac_n "checking for sys_nerr""... $ac_c" 1>&6
echo "configure:6893: checking for sys_nerr" >&5
if eval "test \"`echo '$''{'pgac_cv_var_sys_nerr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 6898 "configure"
#include "confdefs.h"
extern int sys_nerr;
int main() {
int x = sys_nerr;
; return 0; }
EOF
if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
pgac_cv_var_sys_nerr=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
pgac_cv_var_sys_nerr=no
fi
rm -f conftest*
fi
echo "$ac_t""$pgac_cv_var_sys_nerr" 1>&6
if test x"$pgac_cv_var_sys_nerr" = xyes ; then
cat >> confdefs.h <<\EOF
#define HAVE_SYS_NERR
EOF
fi
echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
echo "configure:6895: checking whether long int is 64 bits" >&5 echo "configure:6927: checking whether long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6900,7 +6932,7 @@ else ...@@ -6900,7 +6932,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6904 "configure" #line 6936 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long int int64; typedef long int int64;
...@@ -6929,7 +6961,7 @@ main() { ...@@ -6929,7 +6961,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_type_long_int_64=yes pgac_cv_type_long_int_64=yes
else else
...@@ -6956,7 +6988,7 @@ fi ...@@ -6956,7 +6988,7 @@ fi
if test x"$HAVE_LONG_INT_64" = x"no" ; then if test x"$HAVE_LONG_INT_64" = x"no" ; then
echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6
echo "configure:6960: checking whether long long int is 64 bits" >&5 echo "configure:6992: checking whether long long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6965,7 +6997,7 @@ else ...@@ -6965,7 +6997,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6969 "configure" #line 7001 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long long int int64; typedef long long int int64;
...@@ -6994,7 +7026,7 @@ main() { ...@@ -6994,7 +7026,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_type_long_long_int_64=yes pgac_cv_type_long_long_int_64=yes
else else
...@@ -7025,7 +7057,7 @@ fi ...@@ -7025,7 +7057,7 @@ fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
if [ x$SNPRINTF = x ] ; then if [ x$SNPRINTF = x ] ; then
echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
echo "configure:7029: checking whether snprintf handles 'long long int' as %lld" >&5 echo "configure:7061: checking whether snprintf handles 'long long int' as %lld" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -7034,7 +7066,7 @@ echo "configure:7029: checking whether snprintf handles 'long long int' as %lld" ...@@ -7034,7 +7066,7 @@ echo "configure:7029: checking whether snprintf handles 'long long int' as %lld"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7038 "configure" #line 7070 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -7061,7 +7093,7 @@ main() { ...@@ -7061,7 +7093,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
...@@ -7072,7 +7104,7 @@ else ...@@ -7072,7 +7104,7 @@ else
rm -fr conftest* rm -fr conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
echo "configure:7076: checking whether snprintf handles 'long long int' as %qd" >&5 echo "configure:7108: checking whether snprintf handles 'long long int' as %qd" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -7081,7 +7113,7 @@ echo "configure:7076: checking whether snprintf handles 'long long int' as %qd" ...@@ -7081,7 +7113,7 @@ echo "configure:7076: checking whether snprintf handles 'long long int' as %qd"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7085 "configure" #line 7117 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -7108,7 +7140,7 @@ main() { ...@@ -7108,7 +7140,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%qd"' INT64_FORMAT='"%qd"'
...@@ -7148,12 +7180,12 @@ EOF ...@@ -7148,12 +7180,12 @@ EOF
for ac_func in strtoll strtoq for ac_func in strtoll strtoq
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:7152: checking for $ac_func" >&5 echo "configure:7184: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7157 "configure" #line 7189 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -7176,7 +7208,7 @@ $ac_func(); ...@@ -7176,7 +7208,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -7203,12 +7235,12 @@ done ...@@ -7203,12 +7235,12 @@ done
for ac_func in strtoull strtouq for ac_func in strtoull strtouq
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:7207: checking for $ac_func" >&5 echo "configure:7239: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7212 "configure" #line 7244 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -7231,7 +7263,7 @@ $ac_func(); ...@@ -7231,7 +7263,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -7259,7 +7291,7 @@ done ...@@ -7259,7 +7291,7 @@ done
echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
echo "configure:7263: checking size of unsigned long" >&5 echo "configure:7295: checking size of unsigned long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7267,7 +7299,7 @@ else ...@@ -7267,7 +7299,7 @@ else
ac_cv_sizeof_unsigned_long=4 ac_cv_sizeof_unsigned_long=4
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7271 "configure" #line 7303 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
main() main()
...@@ -7278,7 +7310,7 @@ main() ...@@ -7278,7 +7310,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_sizeof_unsigned_long=`cat conftestval` ac_cv_sizeof_unsigned_long=`cat conftestval`
else else
...@@ -7304,7 +7336,7 @@ EOF ...@@ -7304,7 +7336,7 @@ EOF
echo $ac_n "checking alignment of short""... $ac_c" 1>&6 echo $ac_n "checking alignment of short""... $ac_c" 1>&6
echo "configure:7308: checking alignment of short" >&5 echo "configure:7340: checking alignment of short" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7312,7 +7344,7 @@ else ...@@ -7312,7 +7344,7 @@ else
pgac_cv_alignof_short='sizeof(short)' pgac_cv_alignof_short='sizeof(short)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7316 "configure" #line 7348 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; short field; } mystruct; struct { char filler; short field; } mystruct;
...@@ -7324,7 +7356,7 @@ main() ...@@ -7324,7 +7356,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_short=`cat conftestval` pgac_cv_alignof_short=`cat conftestval`
else else
...@@ -7344,7 +7376,7 @@ EOF ...@@ -7344,7 +7376,7 @@ EOF
echo $ac_n "checking alignment of int""... $ac_c" 1>&6 echo $ac_n "checking alignment of int""... $ac_c" 1>&6
echo "configure:7348: checking alignment of int" >&5 echo "configure:7380: checking alignment of int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7352,7 +7384,7 @@ else ...@@ -7352,7 +7384,7 @@ else
pgac_cv_alignof_int='sizeof(int)' pgac_cv_alignof_int='sizeof(int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7356 "configure" #line 7388 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; int field; } mystruct; struct { char filler; int field; } mystruct;
...@@ -7364,7 +7396,7 @@ main() ...@@ -7364,7 +7396,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_int=`cat conftestval` pgac_cv_alignof_int=`cat conftestval`
else else
...@@ -7384,7 +7416,7 @@ EOF ...@@ -7384,7 +7416,7 @@ EOF
echo $ac_n "checking alignment of long""... $ac_c" 1>&6 echo $ac_n "checking alignment of long""... $ac_c" 1>&6
echo "configure:7388: checking alignment of long" >&5 echo "configure:7420: checking alignment of long" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7392,7 +7424,7 @@ else ...@@ -7392,7 +7424,7 @@ else
pgac_cv_alignof_long='sizeof(long)' pgac_cv_alignof_long='sizeof(long)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7396 "configure" #line 7428 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long field; } mystruct; struct { char filler; long field; } mystruct;
...@@ -7404,7 +7436,7 @@ main() ...@@ -7404,7 +7436,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_long=`cat conftestval` pgac_cv_alignof_long=`cat conftestval`
else else
...@@ -7425,7 +7457,7 @@ EOF ...@@ -7425,7 +7457,7 @@ EOF
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
echo "configure:7429: checking alignment of long long int" >&5 echo "configure:7461: checking alignment of long long int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7433,7 +7465,7 @@ else ...@@ -7433,7 +7465,7 @@ else
pgac_cv_alignof_long_long_int='sizeof(long long int)' pgac_cv_alignof_long_long_int='sizeof(long long int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7437 "configure" #line 7469 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long long int field; } mystruct; struct { char filler; long long int field; } mystruct;
...@@ -7445,7 +7477,7 @@ main() ...@@ -7445,7 +7477,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_long_long_int=`cat conftestval` pgac_cv_alignof_long_long_int=`cat conftestval`
else else
...@@ -7466,7 +7498,7 @@ EOF ...@@ -7466,7 +7498,7 @@ EOF
fi fi
echo $ac_n "checking alignment of double""... $ac_c" 1>&6 echo $ac_n "checking alignment of double""... $ac_c" 1>&6
echo "configure:7470: checking alignment of double" >&5 echo "configure:7502: checking alignment of double" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7474,7 +7506,7 @@ else ...@@ -7474,7 +7506,7 @@ else
pgac_cv_alignof_double='sizeof(double)' pgac_cv_alignof_double='sizeof(double)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7478 "configure" #line 7510 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; double field; } mystruct; struct { char filler; double field; } mystruct;
...@@ -7486,7 +7518,7 @@ main() ...@@ -7486,7 +7518,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_double=`cat conftestval` pgac_cv_alignof_double=`cat conftestval`
else else
...@@ -7524,12 +7556,12 @@ EOF ...@@ -7524,12 +7556,12 @@ EOF
echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
echo "configure:7528: checking for POSIX signal interface" >&5 echo "configure:7560: checking for POSIX signal interface" >&5
if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7533 "configure" #line 7565 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <signal.h> #include <signal.h>
...@@ -7540,7 +7572,7 @@ act.sa_flags = SA_RESTART; ...@@ -7540,7 +7572,7 @@ act.sa_flags = SA_RESTART;
sigaction(0, &act, &oact); sigaction(0, &act, &oact);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
pgac_cv_func_posix_signals=yes pgac_cv_func_posix_signals=yes
else else
...@@ -7570,7 +7602,7 @@ do ...@@ -7570,7 +7602,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7574: checking for $ac_word" >&5 echo "configure:7606: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7606,7 +7638,7 @@ test -n "$TCLSH" && break ...@@ -7606,7 +7638,7 @@ test -n "$TCLSH" && break
done done
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
echo "configure:7610: checking for tclConfig.sh" >&5 echo "configure:7642: checking for tclConfig.sh" >&5
# Let user override test # Let user override test
if test -z "$TCL_CONFIG_SH"; then if test -z "$TCL_CONFIG_SH"; then
pgac_test_dirs="$with_tclconfig" pgac_test_dirs="$with_tclconfig"
...@@ -7639,7 +7671,7 @@ fi ...@@ -7639,7 +7671,7 @@ fi
# Check for Tk configuration script tkConfig.sh # Check for Tk configuration script tkConfig.sh
if test "$with_tk" = yes; then if test "$with_tk" = yes; then
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
echo "configure:7643: checking for tkConfig.sh" >&5 echo "configure:7675: checking for tkConfig.sh" >&5
# Let user override test # Let user override test
if test -z "$TK_CONFIG_SH"; then if test -z "$TK_CONFIG_SH"; then
pgac_test_dirs="$with_tkconfig $with_tclconfig" pgac_test_dirs="$with_tkconfig $with_tclconfig"
...@@ -7678,7 +7710,7 @@ do ...@@ -7678,7 +7710,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7682: checking for $ac_word" >&5 echo "configure:7714: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7714,7 +7746,7 @@ do ...@@ -7714,7 +7746,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7718: checking for $ac_word" >&5 echo "configure:7750: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7745,7 +7777,7 @@ done ...@@ -7745,7 +7777,7 @@ done
echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6
echo "configure:7749: checking for DocBook V3.1" >&5 echo "configure:7781: checking for DocBook V3.1" >&5
if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7778,7 +7810,7 @@ have_docbook=$pgac_cv_check_docbook ...@@ -7778,7 +7810,7 @@ have_docbook=$pgac_cv_check_docbook
echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6
echo "configure:7782: checking for DocBook stylesheets" >&5 echo "configure:7814: checking for DocBook stylesheets" >&5
if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7817,7 +7849,7 @@ do ...@@ -7817,7 +7849,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7821: checking for $ac_word" >&5 echo "configure:7853: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
......
configure.in
View file @ c3f93719
...@@ -945,6 +945,7 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then ...@@ -945,6 +945,7 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then
AC_DEFINE(HAVE_INT_OPTRESET, 1) AC_DEFINE(HAVE_INT_OPTRESET, 1)
fi fi
PGAC_VAR_SYS_NERR
dnl Check to see if we have a working 64-bit integer type. dnl Check to see if we have a working 64-bit integer type.
dnl This breaks down into two steps: dnl This breaks down into two steps:
......
src/backend/utils/error/elog.c
View file @ c3f93719
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.74 2000/12/18 00:44:47 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.75 2001/01/09 18:40:14 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -44,11 +44,6 @@ ...@@ -44,11 +44,6 @@
extern int errno; extern int errno;
#ifdef __CYGWIN__
# define sys_nerr _sys_nerr
#endif
extern int sys_nerr;
extern CommandDest whereToSendOutput; extern CommandDest whereToSendOutput;
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
...@@ -140,8 +135,7 @@ elog(int lev, const char *fmt, ...) ...@@ -140,8 +135,7 @@ elog(int lev, const char *fmt, ...)
if (lev <= DEBUG && Debugfile < 0) if (lev <= DEBUG && Debugfile < 0)
return; /* ignore debug msgs if noplace to send */ return; /* ignore debug msgs if noplace to send */
/* BeOS doesn't have sys_nerr and should be able to use strerror()... */ #ifdef HAVE_SYS_NERR
#ifndef __BEOS__
/* save errno string for %m */ /* save errno string for %m */
if (errno < sys_nerr && errno >= 0) if (errno < sys_nerr && errno >= 0)
errorstr = strerror(errno); errorstr = strerror(errno);
...@@ -152,7 +146,7 @@ elog(int lev, const char *fmt, ...) ...@@ -152,7 +146,7 @@ elog(int lev, const char *fmt, ...)
} }
#else #else
errorstr = strerror(errno); errorstr = strerror(errno);
#endif /* __BEOS__ */ #endif
if (lev == ERROR || lev == FATAL) if (lev == ERROR || lev == FATAL)
{ {
......
src/backend/utils/error/exc.c
View file @ c3f93719
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.32 2000/10/28 23:53:00 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.33 2001/01/09 18:40:14 petere Exp $
* *
* NOTE * NOTE
* XXX this code needs improvement--check for state violations and * XXX this code needs improvement--check for state violations and
...@@ -96,10 +96,6 @@ EnableExceptionHandling(bool on) ...@@ -96,10 +96,6 @@ EnableExceptionHandling(bool on)
extern int errno; extern int errno;
#ifdef __CYGWIN__
# define sys_nerr _sys_nerr
#endif
extern int sys_nerr;
static void static void
ExcPrint(Exception *excP, ExcPrint(Exception *excP,
...@@ -131,7 +127,7 @@ ExcPrint(Exception *excP, ...@@ -131,7 +127,7 @@ ExcPrint(Exception *excP,
fprintf(stderr, " (%ld)", detail); fprintf(stderr, " (%ld)", detail);
#ifndef __BEOS__ #ifdef HAVE_SYS_NERR
if (errno > 0 && errno < sys_nerr) if (errno > 0 && errno < sys_nerr)
#else #else
if (errno > 0) if (errno > 0)
......
src/include/c.h
View file @ c3f93719
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: c.h,v 1.86 2001/01/09 16:07:14 momjian Exp $ * $Id: c.h,v 1.87 2001/01/09 18:40:15 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -993,6 +993,10 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); ...@@ -993,6 +993,10 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
#include <regex/utils.h> #include <regex/utils.h>
#endif #endif
#ifdef HAVE_SYS_NERR
extern int sys_nerr;
#endif
/* ---------------- /* ----------------
* end of c.h * end of c.h
* ---------------- * ----------------
......
src/include/config.h.in
View file @ c3f93719
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your * or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: config.h.in,v 1.154 2000/12/27 23:59:14 tgl Exp $ * $Id: config.h.in,v 1.155 2001/01/09 18:40:15 petere Exp $
*/ */
#ifndef CONFIG_H #ifndef CONFIG_H
...@@ -617,6 +617,9 @@ extern void srandom(unsigned int seed); ...@@ -617,6 +617,9 @@ extern void srandom(unsigned int seed);
/* Define if you have the optreset variable */ /* Define if you have the optreset variable */
#undef HAVE_INT_OPTRESET #undef HAVE_INT_OPTRESET
/* Define if you have the sys_nerr global variable */
#undef HAVE_SYS_NERR
/* Define if you have strtoll() */ /* Define if you have strtoll() */
#undef HAVE_STRTOLL #undef HAVE_STRTOLL
......
src/include/port/beos.h
View file @ c3f93719
...@@ -7,9 +7,6 @@ typedef unsigned char slock_t; ...@@ -7,9 +7,6 @@ typedef unsigned char slock_t;
#define AF_UNIX 10 /* no domain sockets on BeOS */ #define AF_UNIX 10 /* no domain sockets on BeOS */
/* Beos doesn't have sysnerr but strerror should works on every error */
extern int sys_nerr;
/* Beos doesn't have all the required getrusage fields */ /* Beos doesn't have all the required getrusage fields */
#undef HAVE_GETRUSAGE #undef HAVE_GETRUSAGE
......
src/include/port/win.h
View file @ c3f93719
...@@ -9,6 +9,3 @@ typedef unsigned char slock_t; ...@@ -9,6 +9,3 @@ typedef unsigned char slock_t;
#define HAVE_INT_TIMEZONE /* has int _timezone */ #define HAVE_INT_TIMEZONE /* has int _timezone */
#include <cygwin/version.h> #include <cygwin/version.h>
#if (CYGWIN_VERSION_API_MAJOR >= 0) && (CYGWIN_VERSION_API_MINOR >= 8)
#define sys_nerr _sys_nerr
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment