Updated Branches: refs/heads/msvc6 baaf13b3e -> d1a1b110a
Regenerate charmonizer.c Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/d1a1b110 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d1a1b110 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d1a1b110 Branch: refs/heads/msvc6 Commit: d1a1b110a1b5818a3ecd4fb40ef08e50f928fb5b Parents: 308cf3c Author: Nick Wellnhofer <[email protected]> Authored: Sat Nov 10 19:03:04 2012 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Sat Nov 10 19:03:04 2012 +0100 ---------------------------------------------------------------------- clownfish/runtime/common/charmonizer.c | 5 ++--- common/charmonizer.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/d1a1b110/clownfish/runtime/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c index 12d0e13..6cd1481 100644 --- a/clownfish/runtime/common/charmonizer.c +++ b/clownfish/runtime/common/charmonizer.c @@ -3485,6 +3485,7 @@ static const char chaz_Integers_u64_to_double_code[] = CHAZ_QUOTE( double float_num; ) CHAZ_QUOTE( Charm_Setup; ) CHAZ_QUOTE( float_num = (double)int_num; ) + CHAZ_QUOTE( printf("%%f\n", float_num); ) CHAZ_QUOTE( return 0; ) CHAZ_QUOTE( } ); @@ -3631,9 +3632,7 @@ chaz_Integers_run(void) { /* Determine whether conversion of unsigned __int64 to double works */ if (has___int64) { - output = chaz_CC_capture_output(chaz_Integers_u64_to_double_code, - &output_len); - if (output == NULL) { + if (!chaz_CC_test_compile(chaz_Integers_u64_to_double_code)) { can_convert_u64_to_double = false; } } http://git-wip-us.apache.org/repos/asf/lucy/blob/d1a1b110/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index 82c3846..e11f1eb 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -3485,6 +3485,7 @@ static const char chaz_Integers_u64_to_double_code[] = CHAZ_QUOTE( double float_num; ) CHAZ_QUOTE( Charm_Setup; ) CHAZ_QUOTE( float_num = (double)int_num; ) + CHAZ_QUOTE( printf("%%f\n", float_num); ) CHAZ_QUOTE( return 0; ) CHAZ_QUOTE( } ); @@ -3631,9 +3632,7 @@ chaz_Integers_run(void) { /* Determine whether conversion of unsigned __int64 to double works */ if (has___int64) { - output = chaz_CC_capture_output(chaz_Integers_u64_to_double_code, - &output_len); - if (output == NULL) { + if (!chaz_CC_test_compile(chaz_Integers_u64_to_double_code)) { can_convert_u64_to_double = false; } }
