From 3f0df3bc51a9d06a464731bbc9e70fcd21734505 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 25 Feb 2011 10:22:44 +0000 Subject: [PATCH] Merged revisions 88430 via svnmerge from 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. ........ --- Python/dynload_aix.c | 2 +- configure | 4 ++-- configure.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c index 8d56d7d0089..149990d7995 100644 --- a/Python/dynload_aix.c +++ b/Python/dynload_aix.c @@ -12,7 +12,7 @@ #ifdef AIX_GENUINE_CPLUSPLUS -#include "/usr/lpp/xlC/include/load.h" +#include #define aix_load loadAndInit #else #define aix_load load diff --git a/configure b/configure index 5985220f1ac..90efcea4715 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 87699 . +# From configure.in Revision: 88560 . # Guess values for system-dependent variables and create Makefiles. # 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; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "/usr/lpp/xlC/include/load.h" +#include int main () { diff --git a/configure.in b/configure.in index 85ce6fa900c..a24e54b36df 100644 --- a/configure.in +++ b/configure.in @@ -1969,7 +1969,7 @@ AC_CHECK_LIB(intl, textdomain, # checks for system dependent C++ extensions support case "$ac_sys_system" in AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) - AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"], + AC_TRY_LINK([#include ], [loadAndInit("", 0, "")], [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, [Define for AIX if your compiler is a genuine IBM xlC/xlC_r