Received: by mail.netbsd.org (Postfix, from userid 605) id 59BFA84DA0; Wed, 3 Jul 2019 10:42:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D5AA084D6E for ; Wed, 3 Jul 2019 10:42:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 9NbeB7jIKOmP for ; Wed, 3 Jul 2019 10:42:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BE7EA84CE9 for ; Wed, 3 Jul 2019 10:42:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B8135FBF4; Wed, 3 Jul 2019 10:42:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1562150574123700" MIME-Version: 1.0 Date: Wed, 3 Jul 2019 10:42:54 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/devel/subversion To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20190703104254.B8135FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1562150574123700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Wed Jul 3 10:42:54 UTC 2019 Modified Files: pkgsrc/devel/subversion: distinfo pkgsrc/devel/subversion/patches: patch-configure Added Files: pkgsrc/devel/subversion/patches: patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c Log Message: subversion: more reliable fix for APR 1.7.0 From: Stefan Sperling Date: Fri, 12 Apr 2019 09:27:33 +0000 Subject: [PATCH] Get rid of apr_int64_t format string check in swig py configure. This check relied on APR implementation details and broke with APR 1.7.0. Rather than trying to guess a perfect format string to use, just use the largest possible format and cast the argument accordingly. Should fix build against APR 1.7.0 and later. Suggested by: brane * build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. * subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (svn_swig_py_client_blame_receiver_func): Stop relying on the SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and acast to PY_LONG_LONG instead. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 pkgsrc/devel/subversion/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/subversion/patches/patch-configure cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/subversion/patches/patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1562150574123700 Content-Disposition: inline Content-Length: 15173 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/subversion/distinfo diff -u pkgsrc/devel/subversion/distinfo:1.112 pkgsrc/devel/subversion/distinfo:1.113 --- pkgsrc/devel/subversion/distinfo:1.112 Mon May 27 16:10:08 2019 +++ pkgsrc/devel/subversion/distinfo Wed Jul 3 10:42:54 2019 @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.112 2019/05/27 16:10:08 ryoon Exp $ +$NetBSD: distinfo,v 1.113 2019/07/03 10:42:54 markd Exp $ SHA1 (subversion-1.12.0.tar.bz2) = 2dfecac56f18951182dbee4a4f14d27f27ebcdb7 RMD160 (subversion-1.12.0.tar.bz2) = cd06e97d3e109796c3370cb7633081805ee4d957 SHA512 (subversion-1.12.0.tar.bz2) = 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 Size (subversion-1.12.0.tar.bz2) = 8504473 bytes SHA1 (patch-Makefile.in) = 2df6c733d563c0bc7e0d1b4b6e6e00f82ea8c176 -SHA1 (patch-configure) = d0454b65964c6d37753e0b674c2e30205df193a1 +SHA1 (patch-configure) = 3a0650395111c400c9bf0418cd31510e7179f454 SHA1 (patch-subversion_bindings_swig_perl_native_Makefile.PL.in) = 3fadde312693f2a304cd7e348c66cbd373c57854 +SHA1 (patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c) = ed75c4d2fbc911a97bc47e78eaebc5b61078332b SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a Index: pkgsrc/devel/subversion/patches/patch-configure diff -u pkgsrc/devel/subversion/patches/patch-configure:1.4 pkgsrc/devel/subversion/patches/patch-configure:1.5 --- pkgsrc/devel/subversion/patches/patch-configure:1.4 Mon May 27 16:10:08 2019 +++ pkgsrc/devel/subversion/patches/patch-configure Wed Jul 3 10:42:54 2019 @@ -1,78 +1,278 @@ -$NetBSD: patch-configure,v 1.4 2019/05/27 16:10:08 ryoon Exp $ +$NetBSD: patch-configure,v 1.5 2019/07/03 10:42:54 markd Exp $ * Fix build with devel/apr-1.7.0 --- configure.orig 2019-04-11 13:21:28.000000000 +0000 +++ configure -@@ -24344,7 +24344,7 @@ else - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -24329,67 +24329,6 @@ $as_echo "$ac_cv_python_libs" >&6; } + fi + `" + +- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5 +-$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; } +-if ${svn_cv_pycfmt_apr_int64_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="L" - fi - rm -f conftest* -@@ -24358,7 +24358,7 @@ r - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="L" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-r +- #include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="l" - fi - rm -f conftest* -@@ -24859,7 +24859,7 @@ else - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="l" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then : +- svn_cv_pycfmt_apr_int64_t="i" +-fi +-rm -f conftest* +- +- fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5 +-$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; } +- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5 +- fi +- +-cat >>confdefs.h <<_ACEOF +-#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t" +-_ACEOF +- + fi + + if test "$PERL" != "none"; then +@@ -24844,67 +24783,6 @@ $as_echo "$ac_cv_python_libs" >&6; } + fi + `" + +- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5 +-$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; } +-if ${svn_cv_pycfmt_apr_int64_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="L" - fi - rm -f conftest* -@@ -24873,7 +24873,7 @@ r - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="L" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-r +- #include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="l" - fi - rm -f conftest* -@@ -25374,7 +25374,7 @@ else - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="l" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then : +- svn_cv_pycfmt_apr_int64_t="i" +-fi +-rm -f conftest* +- +- fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5 +-$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; } +- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5 +- fi +- +-cat >>confdefs.h <<_ACEOF +-#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t" +-_ACEOF +- + fi + + if test "$PERL" != "none"; then +@@ -25359,67 +25237,6 @@ $as_echo "$ac_cv_python_libs" >&6; } + fi + `" + +- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5 +-$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; } +-if ${svn_cv_pycfmt_apr_int64_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="L" - fi - rm -f conftest* -@@ -25388,7 +25388,7 @@ r - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="L" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-r +- #include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="l" - fi - rm -f conftest* -@@ -25892,7 +25892,7 @@ else - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="l" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then : +- svn_cv_pycfmt_apr_int64_t="i" +-fi +-rm -f conftest* +- +- fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5 +-$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; } +- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5 +- fi +- +-cat >>confdefs.h <<_ACEOF +-#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t" +-_ACEOF +- + fi + + if test "$PERL" != "none"; then +@@ -25877,67 +25694,6 @@ $as_echo "$ac_cv_python_libs" >&6; } + fi + `" + +- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_int64_t Python/C API format string" >&5 +-$as_echo_n "checking for apr_int64_t Python/C API format string... " >&6; } +-if ${svn_cv_pycfmt_apr_int64_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"lld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="L" - fi - rm -f conftest* -@@ -25906,7 +25906,7 @@ r - MaTcHtHiS APR_INT64_T_FMT EnDeNd - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- svn_cv_pycfmt_apr_int64_t="L" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-r +- #include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MaTcHtHiS +\"ld\" +EnDeNd" >/dev/null 2>&1; then : -+ $EGREP "MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd" >/dev/null 2>&1; then : - svn_cv_pycfmt_apr_int64_t="l" - fi - rm -f conftest* +- svn_cv_pycfmt_apr_int64_t="l" +-fi +-rm -f conftest* +- +- fi +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- MaTcHtHiS APR_INT64_T_FMT EnDeNd +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "MaTcHtHiS +\"d\" +EnDeNd" >/dev/null 2>&1; then : +- svn_cv_pycfmt_apr_int64_t="i" +-fi +-rm -f conftest* +- +- fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $svn_cv_pycfmt_apr_int64_t" >&5 +-$as_echo "$svn_cv_pycfmt_apr_int64_t" >&6; } +- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" +- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- as_fn_error $? "failed to recognize APR_INT64_T_FMT on this platform" "$LINENO" 5 +- fi +- +-cat >>confdefs.h <<_ACEOF +-#define SVN_APR_INT64_T_PYCFMT "$svn_cv_pycfmt_apr_int64_t" +-_ACEOF +- + fi + + if test "$PERL" != "none"; then Added files: Index: pkgsrc/devel/subversion/patches/patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c diff -u /dev/null pkgsrc/devel/subversion/patches/patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c:1.1 --- /dev/null Wed Jul 3 10:42:54 2019 +++ pkgsrc/devel/subversion/patches/patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c Wed Jul 3 10:42:54 2019 @@ -0,0 +1,47 @@ +$NetBSD: patch-subversion_bindings_swig_python_libsvn_swig_py_swigutil_py.c,v 1.1 2019/07/03 10:42:54 markd Exp $ + +From: Stefan Sperling +Date: Fri, 12 Apr 2019 09:27:33 +0000 +Subject: [PATCH] Get rid of apr_int64_t format string check in swig py + configure. + +This check relied on APR implementation details and broke with APR 1.7.0. +Rather than trying to guess a perfect format string to use, just use the +largest possible format and cast the argument accordingly. + +Should fix build against APR 1.7.0 and later. + +Suggested by: brane + +* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. + +* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c + (svn_swig_py_client_blame_receiver_func): Stop relying on the + SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and + acast to PY_LONG_LONG instead. + +--- subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c.orig 2018-12-12 13:57:17.000000000 +0000 ++++ subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c +@@ -46,7 +46,7 @@ + #include "svn_mergeinfo.h" + #include "svn_types.h" + +-#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */ ++#include "svn_private_config.h" + + #include "swig_python_external_runtime.swg" + #include "swigutil_py.h" +@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_re + svn_swig_py_acquire_py_lock(); + + if ((result = PyObject_CallFunction(receiver, +- (char *) +- (SVN_APR_INT64_T_PYCFMT "lsssO&"), +- line_no, revision, author, date, line, +- make_ob_pool, pool)) == NULL) ++ (char *)"LlsssO&", ++ (PY_LONG_LONG)line_no, revision, author, ++ date, line, make_ob_pool, pool)) == NULL) + { + err = callback_exception_error(); + } --_----------=_1562150574123700--