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

Commit30735ad

Browse files
committed
do not use unsetenv.c on mingw
1 parent71936fc commit30735ad

File tree

2 files changed

+131
-3
lines changed

2 files changed

+131
-3
lines changed

‎configure

Lines changed: 117 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17448,8 +17448,121 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
1744817448

1744917449

1745017450

17451+
for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
17452+
do
17453+
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
17454+
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
17455+
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
17456+
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
17457+
echo $ECHO_N "(cached) $ECHO_C" >&6
17458+
else
17459+
cat >conftest.$ac_ext <<_ACEOF
17460+
/* confdefs.h. */
17461+
_ACEOF
17462+
cat confdefs.h >>conftest.$ac_ext
17463+
cat >>conftest.$ac_ext <<_ACEOF
17464+
/* end confdefs.h. */
17465+
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
17466+
For example, HP-UX 11i <limits.h> declares gettimeofday. */
17467+
#define $ac_func innocuous_$ac_func
17468+
17469+
/* System header to define __stub macros and hopefully few prototypes,
17470+
which can conflict with char $ac_func (); below.
17471+
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17472+
<limits.h> exists even on freestanding compilers. */
1745117473

17452-
for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv
17474+
#ifdef __STDC__
17475+
# include <limits.h>
17476+
#else
17477+
# include <assert.h>
17478+
#endif
17479+
17480+
#undef $ac_func
17481+
17482+
/* Override any GCC internal prototype to avoid an error.
17483+
Use char because int might match the return type of a GCC
17484+
builtin and then its argument prototype would still apply. */
17485+
#ifdef __cplusplus
17486+
extern "C"
17487+
#endif
17488+
char $ac_func ();
17489+
/* The GNU C library defines this for functions which it implements
17490+
to always fail with ENOSYS. Some functions are actually named
17491+
something starting with __ and the normal name is an alias. */
17492+
#if defined __stub_$ac_func || defined __stub___$ac_func
17493+
choke me
17494+
#endif
17495+
17496+
int
17497+
main ()
17498+
{
17499+
return $ac_func ();
17500+
;
17501+
return 0;
17502+
}
17503+
_ACEOF
17504+
rm -f conftest.$ac_objext conftest$ac_exeext
17505+
if { (ac_try="$ac_link"
17506+
case "(($ac_try" in
17507+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17508+
*) ac_try_echo=$ac_try;;
17509+
esac
17510+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17511+
(eval "$ac_link") 2>conftest.er1
17512+
ac_status=$?
17513+
grep -v '^ *+' conftest.er1 >conftest.err
17514+
rm -f conftest.er1
17515+
cat conftest.err >&5
17516+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
17517+
(exit $ac_status); } && {
17518+
test -z "$ac_c_werror_flag" ||
17519+
test ! -s conftest.err
17520+
} && test -s conftest$ac_exeext &&
17521+
$as_test_x conftest$ac_exeext; then
17522+
eval "$as_ac_var=yes"
17523+
else
17524+
echo "$as_me: failed program was:" >&5
17525+
sed 's/^/| /' conftest.$ac_ext >&5
17526+
17527+
eval "$as_ac_var=no"
17528+
fi
17529+
17530+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17531+
conftest$ac_exeext conftest.$ac_ext
17532+
fi
17533+
ac_res=`eval echo '${'$as_ac_var'}'`
17534+
{ echo "$as_me:$LINENO: result: $ac_res" >&5
17535+
echo "${ECHO_T}$ac_res" >&6; }
17536+
if test `eval echo '${'$as_ac_var'}'` = yes; then
17537+
cat >>confdefs.h <<_ACEOF
17538+
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
17539+
_ACEOF
17540+
17541+
else
17542+
case " $LIBOBJS " in
17543+
*" $ac_func.$ac_objext "* ) ;;
17544+
*) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
17545+
;;
17546+
esac
17547+
17548+
fi
17549+
done
17550+
17551+
17552+
17553+
case $host_os in
17554+
17555+
# Windows uses a specialised env handler
17556+
mingw*)
17557+
17558+
cat >>confdefs.h <<\_ACEOF
17559+
#define HAVE_UNSETENV 1
17560+
_ACEOF
17561+
17562+
ac_cv_func_unsetenv=yes;;
17563+
*)
17564+
17565+
for ac_func in unsetenv
1745317566
do
1745417567
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1745517568
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -17550,6 +17663,9 @@ fi
1755017663
done
1755117664

1755217665

17666+
;;
17667+
esac
17668+
1755317669

1755417670
LIBS="$pgac_save_LIBS"
1755517671

‎configure.in

Lines changed: 14 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 $PostgreSQL: pgsql/configure.in,v 1.590 2009/02/11 20:02:39 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.591 2009/02/12 15:12:47 adunstan Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1242,7 +1242,19 @@ fi
12421242
pgac_save_LIBS="$LIBS"
12431243
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
12441244

1245-
AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv])
1245+
AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
1246+
1247+
case $host_os in
1248+
1249+
# Windows uses a specialised env handler
1250+
mingw*)
1251+
AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 because replacement version used.])
1252+
ac_cv_func_unsetenv=yes;;
1253+
*)
1254+
AC_REPLACE_FUNCS([unsetenv])
1255+
;;
1256+
esac
1257+
12461258

12471259
LIBS="$pgac_save_LIBS"
12481260

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp