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/04/08 21:31:02 UTC
[lucy-commits] [09/12] git commit: refs/heads/master - Regenerate charmonizer.c
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/610d0a85
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/610d0a85
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/610d0a85
Branch: refs/heads/master
Commit: 610d0a857e4d76bddea38eeaf901ae7391994c6c
Parents: 3de236e
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Apr 3 18:50:00 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Apr 8 21:23:22 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.c | 26 ++++++++++++++
clownfish/runtime/common/charmonizer.c | 26 ++++++++++++++
common/charmonizer.c | 48 +++++++++++++++++++-------
3 files changed, 87 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/610d0a85/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index 1dd6967..66d5f0d 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -71,6 +71,10 @@ void
chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename);
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value);
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir);
void
@@ -1196,6 +1200,28 @@ chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename) {
}
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value) {
+ const char *define;
+ char *string;
+ if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+ define = "/D";
+ }
+ else {
+ /* POSIX */
+ define = "-D ";
+ }
+ if (value) {
+ string = chaz_Util_join("", define, name, "=", value, NULL);
+ }
+ else {
+ string = chaz_Util_join("", define, name, NULL);
+ }
+ chaz_CFlags_append(flags, string);
+ free(string);
+}
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir) {
const char *include;
char *string;
http://git-wip-us.apache.org/repos/asf/lucy/blob/610d0a85/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index a0dd426..6cf33ce 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -71,6 +71,10 @@ void
chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename);
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value);
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir);
void
@@ -1475,6 +1479,28 @@ chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename) {
}
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value) {
+ const char *define;
+ char *string;
+ if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+ define = "/D";
+ }
+ else {
+ /* POSIX */
+ define = "-D ";
+ }
+ if (value) {
+ string = chaz_Util_join("", define, name, "=", value, NULL);
+ }
+ else {
+ string = chaz_Util_join("", define, name, NULL);
+ }
+ chaz_CFlags_append(flags, string);
+ free(string);
+}
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir) {
const char *include;
char *string;
http://git-wip-us.apache.org/repos/asf/lucy/blob/610d0a85/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index d551fb0..984bc20 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -71,6 +71,10 @@ void
chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename);
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value);
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir);
void
@@ -1475,6 +1479,28 @@ chaz_CFlags_set_output_exe(chaz_CFlags *flags, const char *filename) {
}
void
+chaz_CFlags_add_define(chaz_CFlags *flags, const char *name,
+ const char *value) {
+ const char *define;
+ char *string;
+ if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+ define = "/D";
+ }
+ else {
+ /* POSIX */
+ define = "-D ";
+ }
+ if (value) {
+ string = chaz_Util_join("", define, name, "=", value, NULL);
+ }
+ else {
+ string = chaz_Util_join("", define, name, NULL);
+ }
+ chaz_CFlags_append(flags, string);
+ free(string);
+}
+
+void
chaz_CFlags_add_include_dir(chaz_CFlags *flags, const char *dir) {
const char *include;
char *string;
@@ -6174,16 +6200,6 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
/* Only core source files require this -- not our headers and
* autogenerated files. */
chaz_CFlags_append(extra_cflags, "-std=gnu99 -D_GNU_SOURCE");
-
- /* 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_append(extra_cflags, "-DHAS_BOOL");
- }
}
else if (chaz_Probe_msvc_version_num()) {
/* Compile as C++ under MSVC. */
@@ -6197,10 +6213,16 @@ S_add_compiler_flags(struct chaz_CLIArgs *args) {
/* Redefine 'for' to fix broken 'for' scoping under MSVC6. */
chaz_CFlags_append(extra_cflags, "/Dfor=\"if(0);else for\"");
}
+ }
- if (args->charmony_pm) {
- chaz_CFlags_append(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_CFlags_add_define(extra_cflags, "HAS_BOOL", NULL);
}
}