Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c973731

Browse files
committed
Don't build replacement getpeereid function on mingw.
Windows doesn't have Unix sockets, so it's not needed, and moreover causes compile warnings.
1 parent 74e6d37 commit c973731

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

configure

+12-4
Original file line numberDiff line numberDiff line change
@@ -20494,8 +20494,7 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
2049420494

2049520495

2049620496

20497-
20498-
for ac_func in crypt erand48 getopt getpeereid getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
20497+
for ac_func in crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
2049920498
do
2050020499
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2050120500
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -20607,16 +20606,25 @@ done
2060720606
case $host_os in
2060820607

2060920608
# Windows uses a specialised env handler
20609+
# and doesn't need a replacement getpeereid because it doesn't use
20610+
# Unix sockets.
2061020611
mingw*)
2061120612

2061220613
cat >>confdefs.h <<\_ACEOF
2061320614
#define HAVE_UNSETENV 1
2061420615
_ACEOF
2061520616

20616-
ac_cv_func_unsetenv=yes;;
20617+
20618+
cat >>confdefs.h <<\_ACEOF
20619+
#define HAVE_GETPEEREID 1
20620+
_ACEOF
20621+
20622+
ac_cv_func_unsetenv=yes
20623+
ac_cv_func_getpeereid=yes;;
2061720624
*)
2061820625

20619-
for ac_func in unsetenv
20626+
20627+
for ac_func in unsetenv getpeereid
2062020628
do
2062120629
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
2062220630
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

configure.in

+7-3
Original file line numberDiff line numberDiff line change
@@ -1311,16 +1311,20 @@ fi
13111311
pgac_save_LIBS="$LIBS"
13121312
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
13131313

1314-
AC_REPLACE_FUNCS([crypt erand48 getopt getpeereid getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
1314+
AC_REPLACE_FUNCS([crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
13151315

13161316
case $host_os in
13171317

13181318
# Windows uses a specialised env handler
1319+
# and doesn't need a replacement getpeereid because it doesn't use
1320+
# Unix sockets.
13191321
mingw*)
13201322
AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 because replacement version used.])
1321-
ac_cv_func_unsetenv=yes;;
1323+
AC_DEFINE(HAVE_GETPEEREID, 1, [Define to 1 because function not required.])
1324+
ac_cv_func_unsetenv=yes
1325+
ac_cv_func_getpeereid=yes;;
13221326
*)
1323-
AC_REPLACE_FUNCS([unsetenv])
1327+
AC_REPLACE_FUNCS([unsetenv getpeereid])
13241328
;;
13251329
esac
13261330

0 commit comments

Comments
 (0)