Repository: lucy-charmonizer Updated Branches: refs/heads/master 79c95021c -> 0539a8ce8
Don't write empty short names section Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/52f48a7d Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/52f48a7d Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/52f48a7d Branch: refs/heads/master Commit: 52f48a7dafb5e5b930a70934bd9310b23e68f465 Parents: 79c9502 Author: Nick Wellnhofer <wellnho...@aevum.de> Authored: Sun Feb 19 18:57:04 2017 +0100 Committer: Nick Wellnhofer <wellnho...@aevum.de> Committed: Sun Feb 19 18:57:04 2017 +0100 ---------------------------------------------------------------------- src/Charmonizer/Core/ConfWriterC.c | 62 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/52f48a7d/src/Charmonizer/Core/ConfWriterC.c ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/ConfWriterC.c b/src/Charmonizer/Core/ConfWriterC.c index e5f67ce..86890c7 100644 --- a/src/Charmonizer/Core/ConfWriterC.c +++ b/src/Charmonizer/Core/ConfWriterC.c @@ -304,39 +304,41 @@ chaz_ConfWriterC_end_module(void) { } /* Write out short names. */ - fprintf(chaz_ConfWriterC.fh, - "\n#if defined(CHY_USE_SHORT_NAMES) " - "|| defined(CHAZ_USE_SHORT_NAMES)\n" - ); - 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; - if (!value || strcmp(sym, value) != 0) { - const char *prefix - = chaz_ConfWriterC_sym_is_uppercase(sym) - ? "CHY_" : "chy_"; - fprintf(chaz_ConfWriterC.fh, " #define %s %s%s\n", - sym, prefix, sym); + if (chaz_ConfWriterC.def_count > 0) { + fprintf(chaz_ConfWriterC.fh, + "\n#if defined(CHY_USE_SHORT_NAMES) " + "|| defined(CHAZ_USE_SHORT_NAMES)\n" + ); + 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; + if (!value || strcmp(sym, value) != 0) { + const char *prefix + = chaz_ConfWriterC_sym_is_uppercase(sym) + ? "CHY_" : "chy_"; + fprintf(chaz_ConfWriterC.fh, " #define %s %s%s\n", + sym, prefix, sym); + } } - } - break; - case CHAZ_CONFELEM_GLOBAL_DEF: - case CHAZ_CONFELEM_GLOBAL_TYPEDEF: - case CHAZ_CONFELEM_SYS_INCLUDE: - case CHAZ_CONFELEM_LOCAL_INCLUDE: - /* no-op */ - break; - default: - chaz_Util_die("Internal error: bad element type %d", - (int)defs[i].type); + break; + case CHAZ_CONFELEM_GLOBAL_DEF: + case CHAZ_CONFELEM_GLOBAL_TYPEDEF: + case CHAZ_CONFELEM_SYS_INCLUDE: + case CHAZ_CONFELEM_LOCAL_INCLUDE: + /* no-op */ + break; + default: + chaz_Util_die("Internal error: bad element type %d", + (int)defs[i].type); + } } - } - fprintf(chaz_ConfWriterC.fh, "#endif /* USE_SHORT_NAMES */\n"); + fprintf(chaz_ConfWriterC.fh, "#endif /* USE_SHORT_NAMES */\n"); + } /* Write out global definitions and system includes. */ if (num_globals) {
