Remove most "short names" pound-defines. Remove now-obsolete "short names" pound-defines from all of Charmonizer except for the test system (which is largely independent).
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/17fccbde Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/17fccbde Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/17fccbde Branch: refs/heads/chaz_namespacing Commit: 17fccbde1e6515c27d98bc9fde19d0f5e987ea93 Parents: f63547c Author: Marvin Humphrey <[email protected]> Authored: Wed Oct 17 17:20:50 2012 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Thu Nov 1 14:30:03 2012 -0700 ---------------------------------------------------------------------- charmonizer/buildbin/meld.pl | 2 - charmonizer/src/Charmonizer/Core/Compiler.c | 2 - charmonizer/src/Charmonizer/Core/Compiler.h | 11 ---------- charmonizer/src/Charmonizer/Core/ConfWriter.c | 2 - charmonizer/src/Charmonizer/Core/ConfWriter.h | 16 --------------- charmonizer/src/Charmonizer/Core/ConfWriterC.c | 2 - charmonizer/src/Charmonizer/Core/ConfWriterC.h | 4 --- charmonizer/src/Charmonizer/Core/ConfWriterPerl.c | 2 - charmonizer/src/Charmonizer/Core/ConfWriterPerl.h | 4 --- charmonizer/src/Charmonizer/Core/ConfWriterRuby.c | 2 - charmonizer/src/Charmonizer/Core/ConfWriterRuby.h | 4 --- charmonizer/src/Charmonizer/Core/Defines.h | 4 --- charmonizer/src/Charmonizer/Core/HeaderChecker.c | 2 - charmonizer/src/Charmonizer/Core/HeaderChecker.h | 7 ------ charmonizer/src/Charmonizer/Core/OperatingSystem.c | 2 - charmonizer/src/Charmonizer/Core/OperatingSystem.h | 12 ----------- charmonizer/src/Charmonizer/Core/Util.c | 2 - charmonizer/src/Charmonizer/Core/Util.h | 12 ----------- charmonizer/src/Charmonizer/Probe.c | 2 - charmonizer/src/Charmonizer/Probe.h | 5 ---- charmonizer/src/Charmonizer/Probe/AtomicOps.c | 2 - charmonizer/src/Charmonizer/Probe/AtomicOps.h | 4 --- charmonizer/src/Charmonizer/Probe/DirManip.c | 2 - charmonizer/src/Charmonizer/Probe/DirManip.h | 4 --- charmonizer/src/Charmonizer/Probe/Floats.c | 2 - charmonizer/src/Charmonizer/Probe/Floats.h | 4 --- charmonizer/src/Charmonizer/Probe/FuncMacro.c | 2 - charmonizer/src/Charmonizer/Probe/FuncMacro.h | 4 --- charmonizer/src/Charmonizer/Probe/Headers.c | 2 - charmonizer/src/Charmonizer/Probe/Headers.h | 5 ---- charmonizer/src/Charmonizer/Probe/Integers.c | 2 - charmonizer/src/Charmonizer/Probe/Integers.h | 4 --- charmonizer/src/Charmonizer/Probe/LargeFiles.c | 2 - charmonizer/src/Charmonizer/Probe/LargeFiles.h | 4 --- charmonizer/src/Charmonizer/Probe/Memory.c | 2 - charmonizer/src/Charmonizer/Probe/Memory.h | 4 --- .../src/Charmonizer/Probe/SymbolVisibility.c | 2 - .../src/Charmonizer/Probe/SymbolVisibility.h | 4 --- charmonizer/src/Charmonizer/Probe/UnusedVars.c | 2 - charmonizer/src/Charmonizer/Probe/UnusedVars.h | 4 --- charmonizer/src/Charmonizer/Probe/VariadicMacros.c | 2 - charmonizer/src/Charmonizer/Probe/VariadicMacros.h | 4 --- 42 files changed, 0 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/buildbin/meld.pl ---------------------------------------------------------------------- diff --git a/charmonizer/buildbin/meld.pl b/charmonizer/buildbin/meld.pl index ff79a5f..ead2dc3 100755 --- a/charmonizer/buildbin/meld.pl +++ b/charmonizer/buildbin/meld.pl @@ -183,8 +183,6 @@ sub meld_start { * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - END_STUFF } http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/Compiler.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/Compiler.c b/charmonizer/src/Charmonizer/Core/Compiler.c index 0610c9b..a419135 100644 --- a/charmonizer/src/Charmonizer/Core/Compiler.c +++ b/charmonizer/src/Charmonizer/Core/Compiler.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include <string.h> #include <stdlib.h> #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/Compiler.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/Compiler.h b/charmonizer/src/Charmonizer/Core/Compiler.h index 47209f4..d4ec471 100644 --- a/charmonizer/src/Charmonizer/Core/Compiler.h +++ b/charmonizer/src/Charmonizer/Core/Compiler.h @@ -74,17 +74,6 @@ chaz_CC_clean_up(void); void chaz_CC_set_warnings_as_errors(const int flag); -#ifdef CHAZ_USE_SHORT_NAMES - #define CC_compile_exe chaz_CC_compile_exe - #define CC_compile_obj chaz_CC_compile_obj - #define CC_add_inc_dir chaz_CC_add_inc_dir - #define CC_clean_up chaz_CC_clean_up - #define CC_test_compile chaz_CC_test_compile - #define CC_capture_output chaz_CC_capture_output - #define CC_init chaz_CC_init - #define CC_set_warnings_as_errors chaz_CC_set_warnings_as_errors -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriter.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.c b/charmonizer/src/Charmonizer/Core/ConfWriter.c index 536a8bd..25b226d 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriter.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriter.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" #include <stdarg.h> http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriter.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriter.h b/charmonizer/src/Charmonizer/Core/ConfWriter.h index 3a45d19..e409d99 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriter.h +++ b/charmonizer/src/Charmonizer/Core/ConfWriter.h @@ -106,22 +106,6 @@ typedef struct chaz_ConfWriter { chaz_ConfWriter_start_module_t start_module; chaz_ConfWriter_end_module_t end_module; } chaz_ConfWriter; -#ifdef CHAZ_USE_SHORT_NAMES - #define ConfWriter chaz_ConfWriter -#endif /* CHAZ_USE_SHORT_NAMES */ - -#ifdef CHAZ_USE_SHORT_NAMES - #define ConfWriter_init chaz_ConfWriter_init - #define ConfWriter_clean_up chaz_ConfWriter_clean_up - #define ConfWriter_build_charm_run chaz_ConfWriter_build_charm_run - #define ConfWriter_start_module chaz_ConfWriter_start_module - #define ConfWriter_end_module chaz_ConfWriter_end_module - #define ConfWriter_append_conf chaz_ConfWriter_append_conf - #define ConfWriter_add_def chaz_ConfWriter_add_def - #define ConfWriter_add_typedef chaz_ConfWriter_add_typedef - #define ConfWriter_add_sys_include chaz_ConfWriter_add_sys_include - #define ConfWriter_add_local_include chaz_ConfWriter_add_local_include -#endif #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterC.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.c b/charmonizer/src/Charmonizer/Core/ConfWriterC.c index b4dda42..372766c 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterC.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterC.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/ConfWriterC.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterC.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.h b/charmonizer/src/Charmonizer/Core/ConfWriterC.h index c593a9a..63c1a26 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterC.h +++ b/charmonizer/src/Charmonizer/Core/ConfWriterC.h @@ -29,10 +29,6 @@ extern "C" { void chaz_ConfWriterC_enable(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define ConfWriterC_enable chaz_ConfWriterC_enable -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c index 50cd156..d12d433 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/ConfWriterPerl.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterPerl.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.h b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.h index 73262d5..136ede8 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterPerl.h +++ b/charmonizer/src/Charmonizer/Core/ConfWriterPerl.h @@ -29,10 +29,6 @@ extern "C" { void chaz_ConfWriterPerl_enable(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define ConfWriterPerl_enable chaz_ConfWriterPerl_enable -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c index dde4947..18dd390 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c +++ b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/ConfWriterRuby.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/ConfWriterRuby.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.h b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.h index 42ad7b9..b77d77c 100644 --- a/charmonizer/src/Charmonizer/Core/ConfWriterRuby.h +++ b/charmonizer/src/Charmonizer/Core/ConfWriterRuby.h @@ -29,10 +29,6 @@ extern "C" { void chaz_ConfWriterRuby_enable(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define ConfWriterRuby_enable chaz_ConfWriterRuby_enable -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/Defines.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/Defines.h b/charmonizer/src/Charmonizer/Core/Defines.h index 11e07d7..e85e856 100644 --- a/charmonizer/src/Charmonizer/Core/Defines.h +++ b/charmonizer/src/Charmonizer/Core/Defines.h @@ -30,10 +30,6 @@ extern "C" { #define CHAZ_QUOTE(x) #x "\n" -#if (defined(CHAZ_USE_SHORT_NAMES) || defined(CHY_USE_SHORT_NAMES)) - #define QUOTE CHAZ_QUOTE -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/HeaderChecker.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/HeaderChecker.c b/charmonizer/src/Charmonizer/Core/HeaderChecker.c index a3cfc38..832e454 100644 --- a/charmonizer/src/Charmonizer/Core/HeaderChecker.c +++ b/charmonizer/src/Charmonizer/Core/HeaderChecker.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/HeaderChecker.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/HeaderChecker.h b/charmonizer/src/Charmonizer/Core/HeaderChecker.h index 949b7ed..2d0a175 100644 --- a/charmonizer/src/Charmonizer/Core/HeaderChecker.h +++ b/charmonizer/src/Charmonizer/Core/HeaderChecker.h @@ -49,13 +49,6 @@ int chaz_HeadCheck_contains_member(const char *struct_name, const char *member, const char *includes); -#ifdef CHAZ_USE_SHORT_NAMES - #define HeadCheck_init chaz_HeadCheck_init - #define HeadCheck_contains_member chaz_HeadCheck_contains_member - #define HeadCheck_check_header chaz_HeadCheck_check_header - #define HeadCheck_check_many_headers chaz_HeadCheck_check_many_headers -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/OperatingSystem.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/OperatingSystem.c b/charmonizer/src/Charmonizer/Core/OperatingSystem.c index 8d12a4d..0523b9b 100644 --- a/charmonizer/src/Charmonizer/Core/OperatingSystem.c +++ b/charmonizer/src/Charmonizer/Core/OperatingSystem.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include <stdlib.h> #include <string.h> #include <stdarg.h> http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/OperatingSystem.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/OperatingSystem.h b/charmonizer/src/Charmonizer/Core/OperatingSystem.h index be6a519..8e5a412 100644 --- a/charmonizer/src/Charmonizer/Core/OperatingSystem.h +++ b/charmonizer/src/Charmonizer/Core/OperatingSystem.h @@ -74,18 +74,6 @@ chaz_OS_dev_null(void); void chaz_OS_init(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define OS_remove chaz_OS_remove - #define OS_run_local chaz_OS_run_local - #define OS_run_quietly chaz_OS_run_quietly - #define OS_mkdir chaz_OS_mkdir - #define OS_rmdir chaz_OS_rmdir - #define OS_exe_ext chaz_OS_exe_ext - #define OS_obj_ext chaz_OS_obj_ext - #define OS_dev_null chaz_OS_dev_null - #define OS_init chaz_OS_init -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/Util.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/Util.c b/charmonizer/src/Charmonizer/Core/Util.c index 39d7075..8f9e269 100644 --- a/charmonizer/src/Charmonizer/Core/Util.c +++ b/charmonizer/src/Charmonizer/Core/Util.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include <errno.h> #include <stdarg.h> #include <stdlib.h> http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Core/Util.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Core/Util.h b/charmonizer/src/Charmonizer/Core/Util.h index 58e8f93..6dbfd90 100644 --- a/charmonizer/src/Charmonizer/Core/Util.h +++ b/charmonizer/src/Charmonizer/Core/Util.h @@ -73,18 +73,6 @@ chaz_Util_remove_and_verify(const char *file_path); int chaz_Util_can_open_file(const char *file_path); -#ifdef CHAZ_USE_SHORT_NAMES - #define Util_verbosity chaz_Util_verbosity - #define Util_write_file chaz_Util_write_file - #define Util_slurp_file chaz_Util_slurp_file - #define Util_flength chaz_Util_flength - #define Util_die chaz_Util_die - #define Util_warn chaz_Util_warn - #define Util_strdup chaz_Util_strdup - #define Util_remove_and_verify chaz_Util_remove_and_verify - #define Util_can_open_file chaz_Util_can_open_file -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe.c b/charmonizer/src/Charmonizer/Probe.c index db72dda..b0342dc 100644 --- a/charmonizer/src/Charmonizer/Probe.c +++ b/charmonizer/src/Charmonizer/Probe.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include <stdio.h> #include <stdlib.h> #include <string.h> http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe.h b/charmonizer/src/Charmonizer/Probe.h index 207723b..ee80130 100644 --- a/charmonizer/src/Charmonizer/Probe.h +++ b/charmonizer/src/Charmonizer/Probe.h @@ -46,11 +46,6 @@ chaz_Probe_init(const char *cc_command, const char *cc_flags); void chaz_Probe_clean_up(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define Probe_init chaz_Probe_init - #define Probe_clean_up chaz_Probe_clean_up -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/AtomicOps.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/AtomicOps.c b/charmonizer/src/Charmonizer/Probe/AtomicOps.c index 8a19f52..79d776e 100644 --- a/charmonizer/src/Charmonizer/Probe/AtomicOps.c +++ b/charmonizer/src/Charmonizer/Probe/AtomicOps.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/AtomicOps.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/AtomicOps.h b/charmonizer/src/Charmonizer/Probe/AtomicOps.h index 277fbf9..548e822 100644 --- a/charmonizer/src/Charmonizer/Probe/AtomicOps.h +++ b/charmonizer/src/Charmonizer/Probe/AtomicOps.h @@ -41,10 +41,6 @@ extern "C" { */ void chaz_AtomicOps_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define AtomicOps_run chaz_AtomicOps_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/DirManip.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/DirManip.c b/charmonizer/src/Charmonizer/Probe/DirManip.c index 5098d6b..c416e2d 100644 --- a/charmonizer/src/Charmonizer/Probe/DirManip.c +++ b/charmonizer/src/Charmonizer/Probe/DirManip.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/OperatingSystem.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/DirManip.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/DirManip.h b/charmonizer/src/Charmonizer/Probe/DirManip.h index 1a7f65d..55b3ecb 100644 --- a/charmonizer/src/Charmonizer/Probe/DirManip.h +++ b/charmonizer/src/Charmonizer/Probe/DirManip.h @@ -58,10 +58,6 @@ extern "C" { */ void chaz_DirManip_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define DirManip_run chaz_DirManip_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Floats.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Floats.c b/charmonizer/src/Charmonizer/Probe/Floats.c index ca1b3d7..6489e46 100644 --- a/charmonizer/src/Charmonizer/Probe/Floats.c +++ b/charmonizer/src/Charmonizer/Probe/Floats.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Floats.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Floats.h b/charmonizer/src/Charmonizer/Probe/Floats.h index 99bff1e..79ad734 100644 --- a/charmonizer/src/Charmonizer/Probe/Floats.h +++ b/charmonizer/src/Charmonizer/Probe/Floats.h @@ -42,10 +42,6 @@ extern "C" { void chaz_Floats_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define Floats_run chaz_Floats_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/FuncMacro.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/FuncMacro.c b/charmonizer/src/Charmonizer/Probe/FuncMacro.c index 3acef64..9606fd0 100644 --- a/charmonizer/src/Charmonizer/Probe/FuncMacro.c +++ b/charmonizer/src/Charmonizer/Probe/FuncMacro.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/FuncMacro.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/FuncMacro.h b/charmonizer/src/Charmonizer/Probe/FuncMacro.h index 20a2d94..bf3b7b2 100644 --- a/charmonizer/src/Charmonizer/Probe/FuncMacro.h +++ b/charmonizer/src/Charmonizer/Probe/FuncMacro.h @@ -49,10 +49,6 @@ extern "C" { */ void chaz_FuncMacro_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define FuncMacro_run chaz_FuncMacro_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Headers.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Headers.c b/charmonizer/src/Charmonizer/Probe/Headers.c index 4624189..2a422df 100644 --- a/charmonizer/src/Charmonizer/Probe/Headers.c +++ b/charmonizer/src/Charmonizer/Probe/Headers.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Headers.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Headers.h b/charmonizer/src/Charmonizer/Probe/Headers.h index d598e2f..340048a 100644 --- a/charmonizer/src/Charmonizer/Probe/Headers.h +++ b/charmonizer/src/Charmonizer/Probe/Headers.h @@ -88,11 +88,6 @@ chaz_Headers_check(const char *header_name); void chaz_Headers_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define Headers_run chaz_Headers_run - #define Headers_check chaz_Headers_check -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Integers.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Integers.c b/charmonizer/src/Charmonizer/Probe/Integers.c index 3adeda5..0c8b9ee 100644 --- a/charmonizer/src/Charmonizer/Probe/Integers.c +++ b/charmonizer/src/Charmonizer/Probe/Integers.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Integers.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Integers.h b/charmonizer/src/Charmonizer/Probe/Integers.h index 701ffa0..50e807b 100644 --- a/charmonizer/src/Charmonizer/Probe/Integers.h +++ b/charmonizer/src/Charmonizer/Probe/Integers.h @@ -136,10 +136,6 @@ extern "C" { */ void chaz_Integers_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define Integers_run chaz_Integers_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/LargeFiles.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/LargeFiles.c b/charmonizer/src/Charmonizer/Probe/LargeFiles.c index 5d4cd2e..941e458 100644 --- a/charmonizer/src/Charmonizer/Probe/LargeFiles.c +++ b/charmonizer/src/Charmonizer/Probe/LargeFiles.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/HeaderChecker.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/LargeFiles.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/LargeFiles.h b/charmonizer/src/Charmonizer/Probe/LargeFiles.h index ea283ba..5142dc2 100644 --- a/charmonizer/src/Charmonizer/Probe/LargeFiles.h +++ b/charmonizer/src/Charmonizer/Probe/LargeFiles.h @@ -55,10 +55,6 @@ extern "C" { */ void chaz_LargeFiles_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define LargeFiles_run chaz_LargeFiles_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Memory.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Memory.c b/charmonizer/src/Charmonizer/Probe/Memory.c index 2747979..4b6928f 100644 --- a/charmonizer/src/Charmonizer/Probe/Memory.c +++ b/charmonizer/src/Charmonizer/Probe/Memory.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Probe/Memory.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/HeaderChecker.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/Memory.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/Memory.h b/charmonizer/src/Charmonizer/Probe/Memory.h index b17487e..69d2c2c 100644 --- a/charmonizer/src/Charmonizer/Probe/Memory.h +++ b/charmonizer/src/Charmonizer/Probe/Memory.h @@ -42,10 +42,6 @@ extern "C" { */ void chaz_Memory_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define Memory_run chaz_Memory_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c index 4998f41..873bb99 100644 --- a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c +++ b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Probe/SymbolVisibility.h" #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/SymbolVisibility.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.h b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.h index 23f95de..10a4a6f 100644 --- a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.h +++ b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.h @@ -26,10 +26,6 @@ extern "C" { void chaz_SymbolVisibility_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define SymbolVisibility_run chaz_SymbolVisibility_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/UnusedVars.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/UnusedVars.c b/charmonizer/src/Charmonizer/Probe/UnusedVars.c index dad90df..f9e7e1b 100644 --- a/charmonizer/src/Charmonizer/Probe/UnusedVars.c +++ b/charmonizer/src/Charmonizer/Probe/UnusedVars.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Util.h" #include "Charmonizer/Probe/UnusedVars.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/UnusedVars.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/UnusedVars.h b/charmonizer/src/Charmonizer/Probe/UnusedVars.h index cb1020b..23b761d 100644 --- a/charmonizer/src/Charmonizer/Probe/UnusedVars.h +++ b/charmonizer/src/Charmonizer/Probe/UnusedVars.h @@ -36,10 +36,6 @@ extern "C" { */ void chaz_UnusedVars_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define UnusedVars_run chaz_UnusedVars_run -#endif - #ifdef __cplusplus } #endif http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/VariadicMacros.c ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/VariadicMacros.c b/charmonizer/src/Charmonizer/Probe/VariadicMacros.c index bdf1506..b71d87b 100644 --- a/charmonizer/src/Charmonizer/Probe/VariadicMacros.c +++ b/charmonizer/src/Charmonizer/Probe/VariadicMacros.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#define CHAZ_USE_SHORT_NAMES - #include "Charmonizer/Core/Compiler.h" #include "Charmonizer/Core/ConfWriter.h" #include "Charmonizer/Core/Util.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/17fccbde/charmonizer/src/Charmonizer/Probe/VariadicMacros.h ---------------------------------------------------------------------- diff --git a/charmonizer/src/Charmonizer/Probe/VariadicMacros.h b/charmonizer/src/Charmonizer/Probe/VariadicMacros.h index d65cf38..ef624b8 100644 --- a/charmonizer/src/Charmonizer/Probe/VariadicMacros.h +++ b/charmonizer/src/Charmonizer/Probe/VariadicMacros.h @@ -42,10 +42,6 @@ extern "C" { */ void chaz_VariadicMacros_run(void); -#ifdef CHAZ_USE_SHORT_NAMES - #define VariadicMacros_run chaz_VariadicMacros_run -#endif - #ifdef __cplusplus } #endif
