lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [12/15] git commit: refs/heads/install-c-library - Don't include charmony.h in external code
Date Sat, 18 May 2013 19:23:57 GMT
Don't include charmony.h in external code

The public header files don't depend on charmony.h anymore. We still
include charmony.h if CFP_LUCY is defined, but this is only for
convenience. The include could be moved to the C source files now.


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

Branch: refs/heads/install-c-library
Commit: b37b804e12d063726308b600dfffa9ab45a86cea
Parents: 4d99bca
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat May 18 12:53:35 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sat May 18 19:15:56 2013 +0200

----------------------------------------------------------------------
 clownfish/compiler/src/CFCBindCore.c |    2 +-
 common/charmonizer.c                 |    1 -
 common/charmonizer.main              |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/b37b804e/clownfish/compiler/src/CFCBindCore.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindCore.c b/clownfish/compiler/src/CFCBindCore.c
index cd2aed8..2f179ec 100644
--- a/clownfish/compiler/src/CFCBindCore.c
+++ b/clownfish/compiler/src/CFCBindCore.c
@@ -173,13 +173,13 @@ S_write_parcel_h(CFCBindCore *self) {
         "\n"
         "#include <stdarg.h>\n"
         "#include <stddef.h>\n"
-        "#include \"charmony.h\"\n"
         "\n"
         "%s"
         "\n"
         "#include \"hostdefs.h\"\n"
         "\n"
         "#ifdef CFP_LUCY\n"
+        "  #include \"charmony.h\"\n"
         "  #define LUCY_VISIBLE CFISH_EXPORT\n"
         "#else\n"
         "  #define LUCY_VISIBLE CFISH_IMPORT\n"

http://git-wip-us.apache.org/repos/asf/lucy/blob/b37b804e/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index d3d0048..82c3421 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -7025,7 +7025,6 @@ S_write_makefile(struct chaz_CLIArgs *args) {
 
     test_cflags = chaz_CC_new_cflags();
     chaz_CFlags_enable_optimization(test_cflags);
-    chaz_CFlags_add_include_dir(test_cflags, ".");
     chaz_CFlags_add_include_dir(test_cflags, autogen_inc_dir);
     chaz_CFlags_add_library(test_cflags, lib);
     scratch = chaz_Util_join(dir_sep, "t", "test_lucy.c", NULL);

http://git-wip-us.apache.org/repos/asf/lucy/blob/b37b804e/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index a685a54..99a28c3 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -313,7 +313,6 @@ S_write_makefile(struct chaz_CLIArgs *args) {
 
     test_cflags = chaz_CC_new_cflags();
     chaz_CFlags_enable_optimization(test_cflags);
-    chaz_CFlags_add_include_dir(test_cflags, ".");
     chaz_CFlags_add_include_dir(test_cflags, autogen_inc_dir);
     chaz_CFlags_add_library(test_cflags, lib);
     scratch = chaz_Util_join(dir_sep, "t", "test_lucy.c", NULL);


Mime
View raw message