Skip to content

Commit cbf54b1

Browse files
committed
configure.in: Avoid autoconf warning: Assume C89 semantics that
RETSIGTYPE is always void (issue #8510). pyconfig.h: Regenerate
1 parent c511b47 commit cbf54b1

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

configure

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 80966 .
2+
# From configure.in Revision: 80969 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.65 for python 2.7.
55
#
@@ -6511,39 +6511,11 @@ _ACEOF
65116511
65126512
fi
65136513
6514-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
6515-
$as_echo_n "checking return type of signal handlers... " >&6; }
6516-
if test "${ac_cv_type_signal+set}" = set; then :
6517-
$as_echo_n "(cached) " >&6
6518-
else
6519-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6520-
/* end confdefs.h. */
6521-
#include <sys/types.h>
6522-
#include <signal.h>
6523-
6524-
int
6525-
main ()
6526-
{
6527-
return *(signal (0, 0)) (0) == 1;
6528-
;
6529-
return 0;
6530-
}
6531-
_ACEOF
6532-
if ac_fn_c_try_compile "$LINENO"; then :
6533-
ac_cv_type_signal=int
6534-
else
6535-
ac_cv_type_signal=void
6536-
fi
6537-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6538-
fi
6539-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
6540-
$as_echo "$ac_cv_type_signal" >&6; }
65416514
65426515
cat >>confdefs.h <<_ACEOF
6543-
#define RETSIGTYPE $ac_cv_type_signal
6516+
#define RETSIGTYPE void
65446517
_ACEOF
65456518
6546-
65476519
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
65486520
if test "x$ac_cv_type_size_t" = x""yes; then :
65496521

configure.in

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,18 +1474,7 @@ EOF
14741474
AC_TYPE_MODE_T
14751475
AC_TYPE_OFF_T
14761476
AC_TYPE_PID_T
1477-
AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
1478-
Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
1479-
AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
1480-
[AC_LANG_PROGRAM([#include <sys/types.h>
1481-
#include <signal.h>
1482-
],
1483-
[return *(signal (0, 0)) (0) == 1;])],
1484-
[ac_cv_type_signal=int],
1485-
[ac_cv_type_signal=void])])
1486-
AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
1487-
(`int' or `void').])
1488-
1477+
AC_DEFINE_UNQUOTED([RETSIGTYPE],[void],[assume C89 semantics that RETSIGTYPE is always void])
14891478
AC_TYPE_SIZE_T
14901479
AC_TYPE_UID_T
14911480
AC_TYPE_UINT32_T

pyconfig.h.in

Lines changed: 59 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#define Py_PYCONFIG_H
66

77

8+
/* Define if building universal (internal helper macro) */
9+
#undef AC_APPLE_UNIVERSAL_BUILD
10+
811
/* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want
912
support for AIX C++ shared extension modules. */
1013
#undef AIX_GENUINE_CPLUSPLUS
@@ -674,25 +677,25 @@
674677
/* Define to 1 if you have the <stropts.h> header file. */
675678
#undef HAVE_STROPTS_H
676679

677-
/* Define to 1 if `st_birthtime' is member of `struct stat'. */
680+
/* Define to 1 if `st_birthtime' is a member of `struct stat'. */
678681
#undef HAVE_STRUCT_STAT_ST_BIRTHTIME
679682

680-
/* Define to 1 if `st_blksize' is member of `struct stat'. */
683+
/* Define to 1 if `st_blksize' is a member of `struct stat'. */
681684
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
682685

683-
/* Define to 1 if `st_blocks' is member of `struct stat'. */
686+
/* Define to 1 if `st_blocks' is a member of `struct stat'. */
684687
#undef HAVE_STRUCT_STAT_ST_BLOCKS
685688

686-
/* Define to 1 if `st_flags' is member of `struct stat'. */
689+
/* Define to 1 if `st_flags' is a member of `struct stat'. */
687690
#undef HAVE_STRUCT_STAT_ST_FLAGS
688691

689-
/* Define to 1 if `st_gen' is member of `struct stat'. */
692+
/* Define to 1 if `st_gen' is a member of `struct stat'. */
690693
#undef HAVE_STRUCT_STAT_ST_GEN
691694

692-
/* Define to 1 if `st_rdev' is member of `struct stat'. */
695+
/* Define to 1 if `st_rdev' is a member of `struct stat'. */
693696
#undef HAVE_STRUCT_STAT_ST_RDEV
694697

695-
/* Define to 1 if `tm_zone' is member of `struct tm'. */
698+
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
696699
#undef HAVE_STRUCT_TM_TM_ZONE
697700

698701
/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
@@ -915,6 +918,9 @@
915918
/* Define to the one symbol short name of this package. */
916919
#undef PACKAGE_TARNAME
917920

921+
/* Define to the home page for this package. */
922+
#undef PACKAGE_URL
923+
918924
/* Define to the version of this package. */
919925
#undef PACKAGE_VERSION
920926

@@ -948,7 +954,7 @@
948954
/* Define if you want to have a Unicode type. */
949955
#undef Py_USING_UNICODE
950956

951-
/* Define as the return type of signal handlers (`int' or `void'). */
957+
/* assume C89 semantics that RETSIGTYPE is always void */
952958
#undef RETSIGTYPE
953959

954960
/* Define if setpgrp() must be called as setpgrp(0, 0). */
@@ -1027,6 +1033,28 @@
10271033
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
10281034
#undef TM_IN_SYS_TIME
10291035

1036+
/* Enable extensions on AIX 3, Interix. */
1037+
#ifndef _ALL_SOURCE
1038+
# undef _ALL_SOURCE
1039+
#endif
1040+
/* Enable GNU extensions on systems that have them. */
1041+
#ifndef _GNU_SOURCE
1042+
# undef _GNU_SOURCE
1043+
#endif
1044+
/* Enable threading extensions on Solaris. */
1045+
#ifndef _POSIX_PTHREAD_SEMANTICS
1046+
# undef _POSIX_PTHREAD_SEMANTICS
1047+
#endif
1048+
/* Enable extensions on HP NonStop. */
1049+
#ifndef _TANDEM_SOURCE
1050+
# undef _TANDEM_SOURCE
1051+
#endif
1052+
/* Enable general extensions on Solaris. */
1053+
#ifndef __EXTENSIONS__
1054+
# undef __EXTENSIONS__
1055+
#endif
1056+
1057+
10301058
/* Define if you want to use MacPython modules on MacOSX in unix-Python. */
10311059
#undef USE_TOOLBOX_OBJECT_GLUE
10321060

@@ -1070,20 +1098,21 @@
10701098
/* Define if you want pymalloc to be disabled when running under valgrind */
10711099
#undef WITH_VALGRIND
10721100

1073-
/* Define to 1 if your processor stores words with the most significant byte
1074-
first (like Motorola and SPARC, unlike Intel and VAX). */
1075-
#undef WORDS_BIGENDIAN
1101+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
1102+
significant byte first (like Motorola and SPARC, unlike Intel). */
1103+
#if defined AC_APPLE_UNIVERSAL_BUILD
1104+
# if defined __BIG_ENDIAN__
1105+
# define WORDS_BIGENDIAN 1
1106+
# endif
1107+
#else
1108+
# ifndef WORDS_BIGENDIAN
1109+
# undef WORDS_BIGENDIAN
1110+
# endif
1111+
#endif
10761112

10771113
/* Define if arithmetic is subject to x87-style double rounding issue */
10781114
#undef X87_DOUBLE_ROUNDING
10791115

1080-
/* Define to 1 if on AIX 3.
1081-
System headers sometimes define this.
1082-
We just want to avoid a redefinition error message. */
1083-
#ifndef _ALL_SOURCE
1084-
# undef _ALL_SOURCE
1085-
#endif
1086-
10871116
/* Define on OpenBSD to activate all library features */
10881117
#undef _BSD_SOURCE
10891118

@@ -1102,28 +1131,38 @@
11021131
/* This must be defined on some systems to enable large file support. */
11031132
#undef _LARGEFILE_SOURCE
11041133

1134+
/* Define to 1 if on MINIX. */
1135+
#undef _MINIX
1136+
11051137
/* Define on NetBSD to activate all library features */
11061138
#undef _NETBSD_SOURCE
11071139

11081140
/* Define _OSF_SOURCE to get the makedev macro. */
11091141
#undef _OSF_SOURCE
11101142

1143+
/* Define to 2 if the system does not provide POSIX.1 features except with
1144+
this defined. */
1145+
#undef _POSIX_1_SOURCE
1146+
11111147
/* Define to activate features from IEEE Stds 1003.1-2001 */
11121148
#undef _POSIX_C_SOURCE
11131149

1150+
/* Define to 1 if you need to in order for `stat' and other things to work. */
1151+
#undef _POSIX_SOURCE
1152+
11141153
/* Define if you have POSIX threads, and your system does not define that. */
11151154
#undef _POSIX_THREADS
11161155

11171156
/* Define to force use of thread-safe errno, h_errno, and other functions */
11181157
#undef _REENTRANT
11191158

11201159
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
1121-
<pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
1160+
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
11221161
#define below would cause a syntax error. */
11231162
#undef _UINT32_T
11241163

11251164
/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
1126-
<pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
1165+
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
11271166
#define below would cause a syntax error. */
11281167
#undef _UINT64_T
11291168

0 commit comments

Comments
 (0)