Updated Branches: refs/heads/master 5dc5b8bb4 -> 3ab6e3997
Use -DHAS_BOOL with all compilers Should fix builds under Linux and BSD. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3ab6e399 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3ab6e399 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3ab6e399 Branch: refs/heads/master Commit: 3ab6e3997114d5900136f21fbcd971b3aaeef336 Parents: 5dc5b8b Author: Nick Wellnhofer <[email protected]> Authored: Fri Jan 4 20:27:16 2013 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Fri Jan 4 20:29:20 2013 +0100 ---------------------------------------------------------------------- common/charmonizer.c | 18 +++++++++--------- common/charmonizer.main | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/3ab6e399/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index f1b212e..f5cfde8 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -4895,16 +4895,16 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) { /* Redefine 'for' to fix broken 'for' scoping under MSVC6. */ chaz_CC_add_extra_cflags("-Dfor=\"if(0);else for\""); + } - /* When compiling for Perl bindings, define HAS_BOOL so that the Perl - * headers don't redefine 'bool' in conflict with C++. - * - * TODO: Compile all files that #include Perl headers separately and - * remove this directive. - */ - if (args->charmony_pm) { - chaz_CC_add_extra_cflags("-DHAS_BOOL"); - } + /* When compiling for Perl bindings, define HAS_BOOL so that the Perl + * headers don't redefine 'bool' in conflict with C++. + * + * TODO: Compile all files that #include Perl headers separately and + * remove this directive. + */ + if (args->charmony_pm) { + chaz_CC_add_extra_cflags("-DHAS_BOOL"); } } http://git-wip-us.apache.org/repos/asf/lucy/blob/3ab6e399/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index 0ce07e7..b25680e 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -65,16 +65,16 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) { /* Redefine 'for' to fix broken 'for' scoping under MSVC6. */ chaz_CC_add_extra_cflags("-Dfor=\"if(0);else for\""); + } - /* When compiling for Perl bindings, define HAS_BOOL so that the Perl - * headers don't redefine 'bool' in conflict with C++. - * - * TODO: Compile all files that #include Perl headers separately and - * remove this directive. - */ - if (args->charmony_pm) { - chaz_CC_add_extra_cflags("-DHAS_BOOL"); - } + /* When compiling for Perl bindings, define HAS_BOOL so that the Perl + * headers don't redefine 'bool' in conflict with C++. + * + * TODO: Compile all files that #include Perl headers separately and + * remove this directive. + */ + if (args->charmony_pm) { + chaz_CC_add_extra_cflags("-DHAS_BOOL"); } }
