You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/05/20 21:09:49 UTC
[lucy-commits] [05/23] git commit: refs/heads/master - Rename hostdefs.h to
cfish_hostdefs.h
Rename hostdefs.h to cfish_hostdefs.h
This header must be publicly available, so add a prefix to avoid name
clashes.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/a00074b9
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/a00074b9
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/a00074b9
Branch: refs/heads/master
Commit: a00074b9987b9741e894b3485b495bc73881295b
Parents: 61055bb
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 18 12:59:54 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 21:01:12 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/src/CFCBindCore.c | 2 +-
clownfish/compiler/src/CFCC.c | 3 ++-
clownfish/compiler/src/CFCC.h | 2 +-
clownfish/compiler/src/CFCPerl.c | 3 ++-
clownfish/compiler/src/CFCRuby.c | 3 ++-
clownfish/compiler/src/CFCRuby.h | 2 +-
6 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCBindCore.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindCore.c b/clownfish/compiler/src/CFCBindCore.c
index 2f179ec..63bcda3 100644
--- a/clownfish/compiler/src/CFCBindCore.c
+++ b/clownfish/compiler/src/CFCBindCore.c
@@ -176,7 +176,7 @@ S_write_parcel_h(CFCBindCore *self) {
"\n"
"%s"
"\n"
- "#include \"hostdefs.h\"\n"
+ "#include \"cfish_hostdefs.h\"\n"
"\n"
"#ifdef CFP_LUCY\n"
" #include \"charmony.h\"\n"
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCC.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCC.c b/clownfish/compiler/src/CFCC.c
index 3e52374..3f21a0d 100644
--- a/clownfish/compiler/src/CFCC.c
+++ b/clownfish/compiler/src/CFCC.c
@@ -186,7 +186,8 @@ CFCC_write_hostdefs(CFCC *self) {
// Unlink then write file.
const char *inc_dest = CFCHierarchy_get_include_dest(self->hierarchy);
- char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "hostdefs.h", inc_dest);
+ char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "cfish_hostdefs.h",
+ inc_dest);
remove(filepath);
CFCUtil_write_file(filepath, content, strlen(content));
FREEMEM(filepath);
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCC.h
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCC.h b/clownfish/compiler/src/CFCC.h
index 3dfcd61..6f665ed 100644
--- a/clownfish/compiler/src/CFCC.h
+++ b/clownfish/compiler/src/CFCC.h
@@ -49,7 +49,7 @@ CFCC_destroy(CFCC *self);
void
CFCC_write_callbacks(CFCC *self);
-/** Write the "hostdefs.h" header file.
+/** Write the "cfish_hostdefs.h" header file.
*/
void
CFCC_write_hostdefs(CFCC *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCPerl.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerl.c b/clownfish/compiler/src/CFCPerl.c
index a2634de..8efc0a1 100644
--- a/clownfish/compiler/src/CFCPerl.c
+++ b/clownfish/compiler/src/CFCPerl.c
@@ -344,7 +344,8 @@ CFCPerl_write_hostdefs(CFCPerl *self) {
// Unlink then write file.
const char *inc_dest = CFCHierarchy_get_include_dest(self->hierarchy);
- char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "hostdefs.h", inc_dest);
+ char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "cfish_hostdefs.h",
+ inc_dest);
remove(filepath);
CFCUtil_write_file(filepath, content, strlen(content));
FREEMEM(filepath);
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCRuby.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCRuby.c b/clownfish/compiler/src/CFCRuby.c
index 678327d..64b3466 100644
--- a/clownfish/compiler/src/CFCRuby.c
+++ b/clownfish/compiler/src/CFCRuby.c
@@ -253,7 +253,8 @@ CFCRuby_write_hostdefs(CFCRuby *self) {
// Unlink then write file.
const char *inc_dest = CFCHierarchy_get_include_dest(self->hierarchy);
- char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "hostdefs.h", inc_dest);
+ char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "cfish_hostdefs.h",
+ inc_dest);
remove(filepath);
CFCUtil_write_file(filepath, content, strlen(content));
FREEMEM(filepath);
http://git-wip-us.apache.org/repos/asf/lucy/blob/a00074b9/clownfish/compiler/src/CFCRuby.h
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCRuby.h b/clownfish/compiler/src/CFCRuby.h
index a694e56..ebe2cfa 100644
--- a/clownfish/compiler/src/CFCRuby.h
+++ b/clownfish/compiler/src/CFCRuby.h
@@ -85,7 +85,7 @@ CFCRuby_destroy(CFCRuby *self);
void
CFCRuby_write_boot(CFCRuby *self);
-/** Write out hostdefs.h file.
+/** Write out cfish_hostdefs.h file.
*/
void
CFCRuby_write_hostdefs(CFCRuby *self);