Update of /cvsroot/python/python/dist/src In directory usw-pr-cvs1:/tmp/cvs-serv30239 Modified Files: configure configure.in pyconfig.h.in Log Message: Use new-style CHECK_TYPE to avoid modifying confdefs.h. Include sys/types.h Fixes #636431. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.356 retrieving revision 1.357 diff -C2 -d -r1.356 -r1.357 *** configure 11 Nov 2002 13:37:26 -0000 1.356 --- configure 11 Nov 2002 14:58:30 -0000 1.357 *************** *** 1,4 **** #! /bin/sh ! # From configure.in Revision: 1.366 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53 for python 2.3. --- 1,4 ---- #! /bin/sh ! # From configure.in Revision: 1.367 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53 for python 2.3. *************** *** 16526,16536 **** fi - # THIS MUST BE LAST, IT CAN BREAK OTHER TESTS! - # Add sys/socket.h to confdefs.h - cat >> confdefs.h <<\EOF - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif - EOF echo "$as_me:$LINENO: checking for socklen_t" >&5 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 --- 16526,16529 ---- *************** *** 16541,16545 **** #line $LINENO "configure" #include "confdefs.h" ! $ac_includes_default #ifdef F77_DUMMY_MAIN # ifdef __cplusplus --- 16534,16546 ---- #line $LINENO "configure" #include "confdefs.h" ! ! #ifdef HAVE_SYS_TYPES_H ! #include <sys/types.h> ! #endif ! #ifdef HAVE_SYS_SOCKET_H ! #include <sys/socket.h> ! #endif ! ! #ifdef F77_DUMMY_MAIN # ifdef __cplusplus *************** *** 16585,16589 **** else ! cat >>confdefs.h <<_ACEOF #define socklen_t int _ACEOF --- 16586,16590 ---- else ! cat >>confdefs.h <<\_ACEOF #define socklen_t int _ACEOF *************** *** 16591,16605 **** fi - - #AC_MSG_CHECKING(for Modules/Setup) - #if test ! -f Modules/Setup ; then - # if test ! -d Modules ; then - # mkdir Modules - # fi - # cp "$srcdir/Modules/Setup.dist" Modules/Setup - # AC_MSG_RESULT(creating) - #else - # AC_MSG_RESULT(already exists) - #fi --- 16592,16595 ---- Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.367 retrieving revision 1.368 diff -C2 -d -r1.367 -r1.368 *** configure.in 11 Nov 2002 13:37:28 -0000 1.367 --- configure.in 11 Nov 2002 14:58:42 -0000 1.368 *************** *** 2446,2468 **** fi ! # THIS MUST BE LAST, IT CAN BREAK OTHER TESTS! ! # Add sys/socket.h to confdefs.h ! cat >> confdefs.h <<\EOF #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif ! EOF ! AC_CHECK_TYPE(socklen_t, int) ! ! #AC_MSG_CHECKING(for Modules/Setup) ! #if test ! -f Modules/Setup ; then ! # if test ! -d Modules ; then ! # mkdir Modules ! # fi ! # cp "$srcdir/Modules/Setup.dist" Modules/Setup ! # AC_MSG_RESULT(creating) ! #else ! # AC_MSG_RESULT(already exists) ! #fi AC_SUBST(THREADHEADERS) --- 2446,2459 ---- fi ! AC_CHECK_TYPE(socklen_t,, ! AC_DEFINE(socklen_t,int, ! Define to `int' if <sys/socket.h> does not define.),[ ! #ifdef HAVE_SYS_TYPES_H ! #include <sys/types.h> ! #endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif ! ]) AC_SUBST(THREADHEADERS) Index: pyconfig.h.in =================================================================== RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** pyconfig.h.in 11 Nov 2002 13:37:28 -0000 1.59 --- pyconfig.h.in 11 Nov 2002 14:58:44 -0000 1.60 *************** *** 843,847 **** #undef size_t ! /* Define to `int' if <sys/types.h> does not define. */ #undef socklen_t --- 843,847 ---- #undef size_t ! /* Define to `int' if <sys/socket.h> does not define. */ #undef socklen_t
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4