Revert "Create Charmonizer typedefs without prefix" This reverts commit 7fbddc89af10034fed3231d5db4852e796ce482e.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6ac61271 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6ac61271 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6ac61271 Branch: refs/heads/msvc6 Commit: 6ac61271e7675bc83abd1e9df95f29cba61243b7 Parents: bc8af2d Author: Nick Wellnhofer <[email protected]> Authored: Sun Nov 4 13:28:23 2012 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Sun Nov 4 13:28:23 2012 +0100 ---------------------------------------------------------------------- charmonizer/src/Charmonizer/Core/ConfWriterC.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/6ac61271/charmonizer/src/Charmonizer/Core/ConfWriterC.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.c b/charmonizer/src/Charmonizer/Core/ConfWriterC.c index 67e2a08..2f1971d 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterC.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterC.c @@ -180,10 +180,10 @@ chaz_ConfWriterC_add_typedef(const char *type, const char *alias) { static void chaz_ConfWriterC_append_typedef_to_conf(const char *type, const char *alias) { if (chaz_ConfWriterC_sym_is_uppercase(alias)) { - fprintf(chaz_ConfWriterC.fh, "typedef %s %s;\n", type, alias); + fprintf(chaz_ConfWriterC.fh, "typedef %s CHY_%s;\n", type, alias); } else { - fprintf(chaz_ConfWriterC.fh, "typedef %s %s;\n", type, alias); + fprintf(chaz_ConfWriterC.fh, "typedef %s chy_%s;\n", type, alias); } } @@ -248,6 +248,7 @@ chaz_ConfWriterC_end_module(void) { for (i = 0; i < chaz_ConfWriterC.def_count; i++) { switch (defs[i].type) { case CHAZ_CONFELEM_DEF: + case CHAZ_CONFELEM_TYPEDEF: { const char *sym = defs[i].str1; const char *value = defs[i].str2; @@ -260,7 +261,6 @@ chaz_ConfWriterC_end_module(void) { } } break; - case CHAZ_CONFELEM_TYPEDEF: case CHAZ_CONFELEM_SYS_INCLUDE: case CHAZ_CONFELEM_LOCAL_INCLUDE: /* no-op */
