traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #8510: Remove nested 'main' functions (causing failure) in 3 configure tests; 

remove some unnecessary '#include "confdefs.h"' lines.  Thanks Roumen Petrov.
This commit is contained in:
Mark Dickinson 2010-05-11 08:55:06 +00:00
parent 035fbba859
commit 5e13e291e0
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 80970 . # From configure.in Revision: 81004 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7. # Generated by GNU Autoconf 2.65 for python 2.7.
# #
@ -5410,7 +5410,7 @@ else
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -5602,7 +5602,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -5644,7 +5644,7 @@ else
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -9731,7 +9731,6 @@ $as_echo_n "checking for ctermid_r... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <stdio.h> #include <stdio.h>
int int
@ -9760,7 +9759,6 @@ $as_echo_n "checking for flock... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <sys/file.h> #include <sys/file.h>
int int
@ -9789,7 +9787,6 @@ $as_echo_n "checking for getpagesize... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <unistd.h> #include <unistd.h>
int int
@ -10109,7 +10106,6 @@ $as_echo_n "checking for hstrerror... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <netdb.h> #include <netdb.h>
int int
@ -10139,7 +10135,6 @@ $as_echo_n "checking for inet_aton... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -10172,7 +10167,6 @@ $as_echo_n "checking for inet_pton... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -10205,7 +10199,6 @@ $as_echo_n "checking for setgroups... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "confdefs.h"
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_GRP_H #ifdef HAVE_GRP_H
#include <grp.h> #include <grp.h>

13
configure.in
View File

@ -979,7 +979,7 @@ yes)
CC="$CC -fno-strict-aliasing" CC="$CC -fno-strict-aliasing"
AC_CACHE_VAL(ac_cv_no_strict_aliasing_ok, AC_CACHE_VAL(ac_cv_no_strict_aliasing_ok,
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[]], [[int main() { return 0; }]])], [AC_LANG_PROGRAM([[]], [[]])],
[ac_cv_no_strict_aliasing_ok=yes], [ac_cv_no_strict_aliasing_ok=yes],
[ac_cv_no_strict_aliasing_ok=no])) [ac_cv_no_strict_aliasing_ok=no]))
CC="$ac_save_cc" CC="$ac_save_cc"
@ -1150,7 +1150,7 @@ AC_CACHE_VAL(ac_cv_opt_olimit_ok,
[ac_save_cc="$CC" [ac_save_cc="$CC"
CC="$CC -OPT:Olimit=0" CC="$CC -OPT:Olimit=0"
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[]], [[int main() { return 0; }]])], [AC_LANG_PROGRAM([[]], [[]])],
[ac_cv_opt_olimit_ok=yes], [ac_cv_opt_olimit_ok=yes],
[ac_cv_opt_olimit_ok=no] [ac_cv_opt_olimit_ok=no]
) )
@ -1173,7 +1173,7 @@ else
[ac_save_cc="$CC" [ac_save_cc="$CC"
CC="$CC -Olimit 1500" CC="$CC -Olimit 1500"
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[]], [[int main() { return 0; }]])], [AC_LANG_PROGRAM([[]], [[]])],
[ac_cv_olimit_ok=yes], [ac_cv_olimit_ok=yes],
[ac_cv_olimit_ok=no] [ac_cv_olimit_ok=no]
) )
@ -2781,7 +2781,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_CHECKING(for ctermid_r) AC_MSG_CHECKING(for ctermid_r)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <stdio.h> #include <stdio.h>
]], [[void* p = ctermid_r]])], ]], [[void* p = ctermid_r]])],
[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.) [AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
@ -2791,7 +2790,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_CHECKING(for flock) AC_MSG_CHECKING(for flock)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <sys/file.h> #include <sys/file.h>
]], [[void* p = flock]])], ]], [[void* p = flock]])],
[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) [AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
@ -2801,7 +2799,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_CHECKING(for getpagesize) AC_MSG_CHECKING(for getpagesize)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <unistd.h> #include <unistd.h>
]], [[void* p = getpagesize]])], ]], [[void* p = getpagesize]])],
[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.) [AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
@ -2892,7 +2889,6 @@ esac
AC_MSG_CHECKING(for hstrerror) AC_MSG_CHECKING(for hstrerror)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <netdb.h> #include <netdb.h>
]], [[void* p = hstrerror; hstrerror(0)]])], ]], [[void* p = hstrerror; hstrerror(0)]])],
[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.) [AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
@ -2902,7 +2898,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_CHECKING(for inet_aton) AC_MSG_CHECKING(for inet_aton)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -2915,7 +2910,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_CHECKING(for inet_pton) AC_MSG_CHECKING(for inet_pton)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -2929,7 +2923,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
# On some systems, setgroups is in unistd.h, on others, in grp.h # On some systems, setgroups is in unistd.h, on others, in grp.h
AC_MSG_CHECKING(for setgroups) AC_MSG_CHECKING(for setgroups)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "confdefs.h"
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_GRP_H #ifdef HAVE_GRP_H
#include <grp.h> #include <grp.h>