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

Recorded merge of revisions 81077 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81077 | mark.dickinson | 2010-05-11 09:55:06 +0100 (Tue, 11 May 2010) | 3 lines

  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 09:23:07 +00:00
parent 899e9a0e7a
commit 8c2b6f1f5a
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 80728 . # From configure.in Revision: 80834 .
# 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 3.2. # Generated by GNU Autoconf 2.65 for python 3.2.
# #
@ -5337,7 +5337,7 @@ else
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -5350,11 +5350,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
void f(int **x) {}
int int
main () main ()
{ {
void f(int **x) {} int main() { double *x; f((int **) &x); return 0; } double *x; f((int **) &x);
; ;
return 0; return 0;
} }
@ -5557,7 +5557,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -5599,7 +5599,7 @@ else
int int
main () main ()
{ {
int main() { return 0; }
; ;
return 0; return 0;
} }
@ -9548,7 +9548,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
@ -9577,7 +9576,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
@ -9606,7 +9604,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
@ -9926,7 +9923,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
@ -9956,7 +9952,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>
@ -9989,7 +9984,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>
@ -10022,7 +10016,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>

17
configure.in
View File

@ -916,14 +916,14 @@ yes)
AC_CACHE_VAL(ac_cv_no_strict_aliasing, AC_CACHE_VAL(ac_cv_no_strict_aliasing,
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[ [
AC_LANG_PROGRAM([[]], [[int main() { return 0; }]]) AC_LANG_PROGRAM([[]], [[]])
],[ ],[
CC="$ac_save_cc -fstrict-aliasing" CC="$ac_save_cc -fstrict-aliasing"
CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" CFLAGS="$CFLAGS -Werror -Wstrict-aliasing"
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[ [
AC_LANG_PROGRAM([[]], AC_LANG_PROGRAM([[void f(int **x) {}]],
[[void f(int **x) {} int main() { double *x; f((int **) &x); return 0; }]]) [[double *x; f((int **) &x);]])
],[ ],[
ac_cv_no_strict_aliasing=no ac_cv_no_strict_aliasing=no
],[ ],[
@ -1099,7 +1099,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]
) )
@ -1122,7 +1122,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]
) )
@ -2663,7 +2663,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.)
@ -2673,7 +2672,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.)
@ -2683,7 +2681,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.)
@ -2774,7 +2771,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.)
@ -2784,7 +2780,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>
@ -2797,7 +2792,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>
@ -2811,7 +2805,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>