Remove disabled ConfWriter data hiding. Since everything ends up in one big amalgamated C file now, the preprocessor directives which kept the ConfWriter struct definition opaque have to be disabled anyway; it's no longer worth keeping them around.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/41935366 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/41935366 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/41935366 Branch: refs/heads/chaz_namespacing Commit: 4193536656f4450bc47f0e71b50a38a65ebf11f7 Parents: c123ce0 Author: Marvin Humphrey <[email protected]> Authored: Wed Oct 17 16:17:59 2012 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Thu Nov 1 11:05:24 2012 -0700 ---------------------------------------------------------------------- charmonizer/buildbin/meld.pl | 1 - charmonizer/src/Charmonizer/Core/ConfWriter.c | 1 - charmonizer/src/Charmonizer/Core/ConfWriter.h | 2 -- charmonizer/src/Charmonizer/Core/ConfWriterC.c | 1 - charmonizer/src/Charmonizer/Core/ConfWriterPerl.c | 1 - charmonizer/src/Charmonizer/Core/ConfWriterRuby.c | 1 - 6 files changed, 0 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/buildbin/meld.pl ---------------------------------------------------------------------- diff --git a/charmonizer/buildbin/meld.pl b/charmonizer/buildbin/meld.pl index 04f8985..ff79a5f 100755 --- a/charmonizer/buildbin/meld.pl +++ b/charmonizer/buildbin/meld.pl @@ -184,7 +184,6 @@ sub meld_start { */ #define CHAZ_USE_SHORT_NAMES -#define CHAZ_CONFWRITER_INTERNAL END_STUFF } http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/src/Charmonizer/Core/ConfWriter.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.c b/charmonizer/src/Charmonizer/Core/ConfWriter.c index 6dfcc99..53e7d48 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriter.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriter.c @@ -14,7 +14,6 @@ * limitations under the License. */ -#define CHAZ_CONFWRITER_INTERNAL #define CHAZ_USE_SHORT_NAMES #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/src/Charmonizer/Core/ConfWriter.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.h b/charmonizer/src/Charmonizer/Core/ConfWriter.h index 37b65e6..3a45d19 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriter.h +++ b/charmonizer/src/Charmonizer/Core/ConfWriter.h @@ -80,7 +80,6 @@ chaz_ConfWriter_end_module(void); void chaz_ConfWriter_add_writer(struct chaz_ConfWriter *writer); -#ifdef CHAZ_CONFWRITER_INTERNAL typedef void (*chaz_ConfWriter_clean_up_t)(void); typedef void @@ -110,7 +109,6 @@ typedef struct chaz_ConfWriter { #ifdef CHAZ_USE_SHORT_NAMES #define ConfWriter chaz_ConfWriter #endif /* CHAZ_USE_SHORT_NAMES */ -#endif /* CHAZ_CONFWRITER_INTERNAL */ #ifdef CHAZ_USE_SHORT_NAMES #define ConfWriter_init chaz_ConfWriter_init http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/src/Charmonizer/Core/ConfWriterC.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.c b/charmonizer/src/Charmonizer/Core/ConfWriterC.c index 3b6a9eb..0f0ac15 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterC.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterC.c @@ -15,7 +15,6 @@ */ #define CHAZ_USE_SHORT_NAMES -#define CHAZ_CONFWRITER_INTERNAL #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c index 2decf0b..b10b274 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c @@ -15,7 +15,6 @@ */ #define CHAZ_USE_SHORT_NAMES -#define CHAZ_CONFWRITER_INTERNAL #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/41935366/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c index 7c3e335..e99f98c 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c @@ -15,7 +15,6 @@ */ #define CHAZ_USE_SHORT_NAMES -#define CHAZ_CONFWRITER_INTERNAL #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h"
