lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [lucy-commits] [30/54] [abbrv] git commit: refs/heads/sortex_ptr_only - Define HAS_BOOL in source, not via compiler flags
Date Sat, 26 Apr 2014 23:12:00 GMT
Define HAS_BOOL in source, not via compiler flags


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/f333df05
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/f333df05
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/f333df05

Branch: refs/heads/sortex_ptr_only
Commit: f333df05a85660b77254a8445f4f16fec4228101
Parents: 9b9b8c2
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat Jul 20 22:53:49 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Tue Apr 22 21:26:59 2014 +0200

----------------------------------------------------------------------
 common/charmonizer.c    | 10 ----------
 common/charmonizer.main | 10 ----------
 2 files changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/f333df05/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 31f0481..773b578 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -7082,16 +7082,6 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
         }
     }
 
-    /* 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_CFlags_add_define(extra_cflags, "HAS_BOOL", NULL);
-    }
-
     chaz_CFlags_add_define(extra_cflags, "CFP_LUCY", NULL);
     chaz_CFlags_add_define(extra_cflags, "CFP_TESTLUCY", NULL);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/f333df05/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index b01d3d6..f698987 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -84,16 +84,6 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
         }
     }
 
-    /* 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_CFlags_add_define(extra_cflags, "HAS_BOOL", NULL);
-    }
-
     chaz_CFlags_add_define(extra_cflags, "CFP_LUCY", NULL);
     chaz_CFlags_add_define(extra_cflags, "CFP_TESTLUCY", NULL);
 }


Mime
View raw message