mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 88430 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r88430 | georg.brandl | 2011-02-15 20:48:59 +0100 (Di, 15 Feb 2011) | 1 line

  #730467: Another small AIX fix.
........
This commit is contained in:
Georg Brandl 2011-02-25 10:22:44 +00:00
parent 6baf117d88
commit 3f0df3bc51
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/dynload_aix.c
View file

@ -12,7 +12,7 @@
#ifdef AIX_GENUINE_CPLUSPLUS #ifdef AIX_GENUINE_CPLUSPLUS
#include "/usr/lpp/xlC/include/load.h" #include <load.h>
#define aix_load loadAndInit #define aix_load loadAndInit
#else #else
#define aix_load load #define aix_load load

4
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 87699 . # From configure.in Revision: 88560 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for python 3.1. # Generated by GNU Autoconf 2.68 for python 3.1.
# #
@ -7914,7 +7914,7 @@ case "$ac_sys_system" in
$as_echo_n "checking for genuine AIX C++ extensions support... " >&6; } $as_echo_n "checking for genuine AIX C++ extensions support... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "/usr/lpp/xlC/include/load.h" #include <load.h>
int int
main () main ()
{ {

2
configure.in
View file

@ -1969,7 +1969,7 @@ AC_CHECK_LIB(intl, textdomain,
# checks for system dependent C++ extensions support # checks for system dependent C++ extensions support
case "$ac_sys_system" in case "$ac_sys_system" in
AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support)
AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"], AC_TRY_LINK([#include <load.h>],
[loadAndInit("", 0, "")], [loadAndInit("", 0, "")],
[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
[Define for AIX if your compiler is a genuine IBM xlC/xlC_r [Define for AIX if your compiler is a genuine IBM xlC/xlC_r