Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 678fc1e

Browse files
loewisloewis
committed
Don't define _XOPEN_SOURCE and _POSIX_C_SOURCE on FreeBSD 5.0. Fixes #636318.
1 parent c7ff90b commit 678fc1e

3 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎configure‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 1.367 .
2+
# From configure.in Revision: 1.368 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.53 for python 2.3.
55
#
@@ -1252,28 +1252,8 @@ cat >>confdefs.h <<\_ACEOF
12521252
_ACEOF
12531253
12541254
1255-
# The definition of _GNU_SOURCE potentially causes a change of the value
1256-
# of _XOPEN_SOURCE. So define it only conditionally.
1257-
1258-
1259-
12601255
define_xopen_source=yes
12611256
1262-
# On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires definition
1263-
# of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else several APIs
1264-
# are not declared. Since this is also needed in some cases for HP-UX,
1265-
# we define it globally.
1266-
1267-
cat >>confdefs.h <<\_ACEOF
1268-
#define _XOPEN_SOURCE_EXTENDED 1
1269-
_ACEOF
1270-
1271-
1272-
cat >>confdefs.h <<\_ACEOF
1273-
#define _POSIX_C_SOURCE 199506L
1274-
_ACEOF
1275-
1276-
12771257
# Arguments passed to configure.
12781258
12791259
CONFIG_ARGS="$ac_configure_args"
@@ -1361,14 +1341,36 @@ case $ac_sys_system/$ac_sys_release in
13611341
# even though select is a POSIX function. Reported by J. Ribbens.
13621342
OpenBSD/2.* | OpenBSD/3.[012])
13631343
define_xopen_source=no;;
1344+
# On FreeBSD 5.0, chroot and setgroups are not declared if _XOPEN_SOURCE
1345+
# is define. Reported by M. Recht.
1346+
FreeBSD/5.0*)
1347+
define_xopen_source=no;;
13641348
esac
13651349
13661350
if test $define_xopen_source = yes
13671351
then
1368-
cat >>confdefs.h <<\_ACEOF
1369-
#define _XOPEN_SOURCE 500
1352+
1353+
cat >>confdefs.h <<\_ACEOF
1354+
#define _XOPEN_SOURCE 600
1355+
_ACEOF
1356+
1357+
1358+
# On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires
1359+
# definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
1360+
# several APIs are not declared. Since this is also needed in some
1361+
# cases for HP-UX, we define it globally.
1362+
1363+
1364+
cat >>confdefs.h <<\_ACEOF
1365+
#define _XOPEN_SOURCE_EXTENDED 1
13701366
_ACEOF
13711367
1368+
1369+
cat >>confdefs.h <<\_ACEOF
1370+
#define _POSIX_C_SOURCE 200112L
1371+
_ACEOF
1372+
1373+
13721374
fi
13731375
13741376
#

‎configure.in‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,8 @@ SOVERSION=1.0
3434
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
3535
AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate all library features])
3636

37-
# The definition of _GNU_SOURCE potentially causes a change of the value
38-
# of _XOPEN_SOURCE. So define it only conditionally.
39-
AH_VERBATIM([_XOPEN_SOURCE],
40-
[/* Define on UNIX to activate XPG/5 features. */
41-
#ifndef _XOPEN_SOURCE
42-
# undef _XOPEN_SOURCE
43-
#endif])
44-
4537
define_xopen_source=yes
4638

47-
# On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires definition
48-
# of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else several APIs
49-
# are not declared. Since this is also needed in some cases for HP-UX,
50-
# we define it globally.
51-
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Define to activate Unix95-and-earlier features)
52-
AC_DEFINE(_POSIX_C_SOURCE, 199506L, Define to activate features from IEEE Stds 1003.{123}-1995)
53-
5439
# Arguments passed to configure.
5540
AC_SUBST(CONFIG_ARGS)
5641
CONFIG_ARGS="$ac_configure_args"
@@ -135,11 +120,25 @@ case $ac_sys_system/$ac_sys_release in
135120
# even though select is a POSIX function. Reported by J. Ribbens.
136121
OpenBSD/2.* | OpenBSD/3.@<:@012@:>@)
137122
define_xopen_source=no;;
123+
# On FreeBSD 5.0, chroot and setgroups are not declared if _XOPEN_SOURCE
124+
# is define. Reported by M. Recht.
125+
FreeBSD/5.0*)
126+
define_xopen_source=no;;
138127
esac
139128

140129
if test $define_xopen_source = yes
141130
then
142-
AC_DEFINE(_XOPEN_SOURCE, 500)
131+
AC_DEFINE(_XOPEN_SOURCE, 600,
132+
Define to the level of X/Open that your system supports)
133+
134+
# On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires
135+
# definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
136+
# several APIs are not declared. Since this is also needed in some
137+
# cases for HP-UX, we define it globally.
138+
139+
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Define to activate Unix95-and-earlier features)
140+
AC_DEFINE(_POSIX_C_SOURCE, 200112L, Define to activate features from IEEE Stds 1003.1-2001)
141+
143142
fi
144143

145144
#

‎pyconfig.h.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@
790790
this defined. */
791791
#undef _POSIX_1_SOURCE
792792

793-
/* Define to activate features from IEEE Stds 1003.{123}-1995 */
793+
/* Define to activate features from IEEE Stds 1003.1-2001 */
794794
#undef _POSIX_C_SOURCE
795795

796796
/* Define to 1 if you need to in order for `stat' and other things to work. */
@@ -802,10 +802,8 @@
802802
/* Define to force use of thread-safe errno, h_errno, and other functions */
803803
#undef _REENTRANT
804804

805-
/* Define on UNIX to activate XPG/5 features. */
806-
#ifndef _XOPEN_SOURCE
807-
# undef _XOPEN_SOURCE
808-
#endif
805+
/* Define to the level of X/Open that your system supports */
806+
#undef _XOPEN_SOURCE
809807

810808
/* Define to activate Unix95-and-earlier features */
811809
#undef _XOPEN_SOURCE_EXTENDED

0 commit comments

Comments
 (0)