You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2012/11/03 19:21:54 UTC
[lucy-commits] [15/16] Use full symbol names in Charmonizer.
http://git-wip-us.apache.org/repos/asf/lucy/blob/659210f9/charmonizer/src/Charmonizer/Probe/LargeFiles.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/LargeFiles.c b/charmonizer/src/Charmonizer/Probe/LargeFiles.c
index c2d4113..5d4cd2e 100644
--- a/charmonizer/src/Charmonizer/Probe/LargeFiles.c
+++ b/charmonizer/src/Charmonizer/Probe/LargeFiles.c
@@ -93,7 +93,7 @@ static char pread64_command[10];
static char off64_type[10];
void
-LargeFiles_run(void) {
+chaz_LargeFiles_run(void) {
int found_off64_t = false;
int found_stdio64 = false;
int found_lseek = false;
@@ -101,13 +101,13 @@ LargeFiles_run(void) {
unsigned i;
const char *stat_includes = "#include <stdio.h>\n#include <sys/stat.h>";
- ConfWriter_start_module("LargeFiles");
+ chaz_ConfWriter_start_module("LargeFiles");
/* Find off64_t or equivalent. */
found_off64_t = S_probe_off64();
if (found_off64_t) {
- ConfWriter_add_def("HAS_64BIT_OFFSET_TYPE", NULL);
- ConfWriter_add_def("off64_t", off64_type);
+ chaz_ConfWriter_add_def("HAS_64BIT_OFFSET_TYPE", NULL);
+ chaz_ConfWriter_add_def("off64_t", off64_type);
}
/* See if stdio variants with 64-bit support exist. */
@@ -115,13 +115,13 @@ LargeFiles_run(void) {
stdio64_combo combo = stdio64_combos[i];
if (S_probe_stdio64(&combo)) {
found_stdio64 = true;
- ConfWriter_add_def("HAS_64BIT_STDIO", NULL);
+ chaz_ConfWriter_add_def("HAS_64BIT_STDIO", NULL);
strcpy(fopen_command, combo.fopen_command);
strcpy(fseek_command, combo.fseek_command);
strcpy(ftell_command, combo.ftell_command);
- ConfWriter_add_def("fopen64", fopen_command);
- ConfWriter_add_def("ftello64", ftell_command);
- ConfWriter_add_def("fseeko64", fseek_command);
+ chaz_ConfWriter_add_def("fopen64", fopen_command);
+ chaz_ConfWriter_add_def("ftello64", ftell_command);
+ chaz_ConfWriter_add_def("fseeko64", fseek_command);
break;
}
}
@@ -132,9 +132,9 @@ LargeFiles_run(void) {
unbuff_combo combo = unbuff_combos[i];
found_lseek = S_probe_lseek(&combo);
if (found_lseek) {
- ConfWriter_add_def("HAS_64BIT_LSEEK", NULL);
+ chaz_ConfWriter_add_def("HAS_64BIT_LSEEK", NULL);
strcpy(lseek_command, combo.lseek_command);
- ConfWriter_add_def("lseek64", lseek_command);
+ chaz_ConfWriter_add_def("lseek64", lseek_command);
break;
}
}
@@ -142,9 +142,9 @@ LargeFiles_run(void) {
unbuff_combo combo = unbuff_combos[i];
found_pread64 = S_probe_pread64(&combo);
if (found_pread64) {
- ConfWriter_add_def("HAS_64BIT_PREAD", NULL);
+ chaz_ConfWriter_add_def("HAS_64BIT_PREAD", NULL);
strcpy(pread64_command, combo.pread64_command);
- ConfWriter_add_def("pread64", pread64_command);
+ chaz_ConfWriter_add_def("pread64", pread64_command);
found_pread64 = true;
break;
}
@@ -152,35 +152,35 @@ LargeFiles_run(void) {
}
/* Make checks needed for testing. */
- if (HeadCheck_check_header("sys/stat.h")) {
- ConfWriter_append_conf("#define CHAZ_HAS_SYS_STAT_H\n");
+ if (chaz_HeadCheck_check_header("sys/stat.h")) {
+ chaz_ConfWriter_append_conf("#define CHAZ_HAS_SYS_STAT_H\n");
}
- if (HeadCheck_check_header("io.h")) {
- ConfWriter_append_conf("#define CHAZ_HAS_IO_H\n");
+ if (chaz_HeadCheck_check_header("io.h")) {
+ chaz_ConfWriter_append_conf("#define CHAZ_HAS_IO_H\n");
}
- if (HeadCheck_check_header("fcntl.h")) {
- ConfWriter_append_conf("#define CHAZ_HAS_FCNTL_H\n");
+ if (chaz_HeadCheck_check_header("fcntl.h")) {
+ chaz_ConfWriter_append_conf("#define CHAZ_HAS_FCNTL_H\n");
}
- if (HeadCheck_contains_member("struct stat", "st_size", stat_includes)) {
- ConfWriter_append_conf("#define CHAZ_HAS_STAT_ST_SIZE\n");
+ if (chaz_HeadCheck_contains_member("struct stat", "st_size", stat_includes)) {
+ chaz_ConfWriter_append_conf("#define CHAZ_HAS_STAT_ST_SIZE\n");
}
- if (HeadCheck_contains_member("struct stat", "st_blocks", stat_includes)) {
- ConfWriter_append_conf("#define CHAZ_HAS_STAT_ST_BLOCKS\n");
+ if (chaz_HeadCheck_contains_member("struct stat", "st_blocks", stat_includes)) {
+ chaz_ConfWriter_append_conf("#define CHAZ_HAS_STAT_ST_BLOCKS\n");
}
- ConfWriter_end_module();
+ chaz_ConfWriter_end_module();
}
/* Code for finding an off64_t or some other 64-bit signed type. */
static const char off64_code[] =
- QUOTE( %s )
- QUOTE( #include "_charm.h" )
- QUOTE( int main() )
- QUOTE( { )
- QUOTE( Charm_Setup; )
- QUOTE( printf("%%d", (int)sizeof(%s)); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( %s )
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( int main() )
+ CHAZ_QUOTE( { )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( printf("%%d", (int)sizeof(%s)); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
static const int
S_probe_off64(void) {
@@ -192,14 +192,14 @@ S_probe_off64(void) {
const char *candidate = off64_options[i];
char *output;
size_t output_len;
- int has_sys_types_h = HeadCheck_check_header("sys/types.h");
+ int has_sys_types_h = chaz_HeadCheck_check_header("sys/types.h");
const char *sys_types_include = has_sys_types_h
? "#include <sys/types.h>"
: "";
/* Execute the probe. */
sprintf(code_buf, off64_code, sys_types_include, candidate);
- output = CC_capture_output(code_buf, &output_len);
+ output = chaz_CC_capture_output(code_buf, &output_len);
if (output != NULL) {
long sizeof_candidate = strtol(output, NULL, 10);
free(output);
@@ -216,19 +216,19 @@ S_probe_off64(void) {
/* Code for checking ftello64 and friends. */
static const char stdio64_code[] =
- QUOTE( %s )
- QUOTE( #include "_charm.h" )
- QUOTE( int main() { )
- QUOTE( %s pos; )
- QUOTE( FILE *f; )
- QUOTE( Charm_Setup; )
- QUOTE( f = %s("_charm_stdio64", "w"); )
- QUOTE( if (f == NULL) return -1; )
- QUOTE( printf("%%d", (int)sizeof(%s)); )
- QUOTE( pos = %s(stdout); )
- QUOTE( %s(stdout, 0, SEEK_SET); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( %s )
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( %s pos; )
+ CHAZ_QUOTE( FILE *f; )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( f = %s("_charm_stdio64", "w"); )
+ CHAZ_QUOTE( if (f == NULL) return -1; )
+ CHAZ_QUOTE( printf("%%d", (int)sizeof(%s)); )
+ CHAZ_QUOTE( pos = %s(stdout); )
+ CHAZ_QUOTE( %s(stdout, 0, SEEK_SET); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
static int
@@ -250,7 +250,7 @@ S_probe_stdio64(stdio64_combo *combo) {
combo->fseek_command);
/* Verify compilation and that the offset type has 8 bytes. */
- output = CC_capture_output(code_buf, &output_len);
+ output = chaz_CC_capture_output(code_buf, &output_len);
if (output != NULL) {
long size = strtol(output, NULL, 10);
if (size == 8) {
@@ -259,8 +259,8 @@ S_probe_stdio64(stdio64_combo *combo) {
free(output);
}
- if (!Util_remove_and_verify("_charm_stdio64")) {
- Util_die("Failed to remove '_charm_stdio64'");
+ if (!chaz_Util_remove_and_verify("_charm_stdio64")) {
+ chaz_Util_die("Failed to remove '_charm_stdio64'");
}
return success;
@@ -268,18 +268,18 @@ S_probe_stdio64(stdio64_combo *combo) {
/* Code for checking 64-bit lseek. */
static const char lseek_code[] =
- QUOTE( %s )
- QUOTE( #include "_charm.h" )
- QUOTE( int main() { )
- QUOTE( int fd; )
- QUOTE( Charm_Setup; )
- QUOTE( fd = open("_charm_lseek", O_WRONLY | O_CREAT, 0666); )
- QUOTE( if (fd == -1) { return -1; } )
- QUOTE( %s(fd, 0, SEEK_SET); )
- QUOTE( printf("%%d", 1); )
- QUOTE( if (close(fd)) { return -1; } )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( %s )
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( int fd; )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( fd = open("_charm_lseek", O_WRONLY | O_CREAT, 0666); )
+ CHAZ_QUOTE( if (fd == -1) { return -1; } )
+ CHAZ_QUOTE( %s(fd, 0, SEEK_SET); )
+ CHAZ_QUOTE( printf("%%d", 1); )
+ CHAZ_QUOTE( if (close(fd)) { return -1; } )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
static int
S_probe_lseek(unbuff_combo *combo) {
@@ -294,14 +294,14 @@ S_probe_lseek(unbuff_combo *combo) {
/* Verify compilation. */
sprintf(code_buf, lseek_code, combo->includes, combo->lseek_command);
- output = CC_capture_output(code_buf, &output_len);
+ output = chaz_CC_capture_output(code_buf, &output_len);
if (output != NULL) {
success = true;
free(output);
}
- if (!Util_remove_and_verify("_charm_lseek")) {
- Util_die("Failed to remove '_charm_lseek'");
+ if (!chaz_Util_remove_and_verify("_charm_lseek")) {
+ chaz_Util_die("Failed to remove '_charm_lseek'");
}
free(code_buf);
@@ -311,16 +311,16 @@ S_probe_lseek(unbuff_combo *combo) {
/* Code for checking 64-bit pread. The pread call will fail, but that's fine
* as long as it compiles. */
static const char pread64_code[] =
- QUOTE( %s )
- QUOTE( #include "_charm.h" )
- QUOTE( int main() { )
- QUOTE( int fd = 20; )
- QUOTE( char buf[1]; )
- QUOTE( Charm_Setup; )
- QUOTE( printf("1"); )
- QUOTE( %s(fd, buf, 1, 1); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( %s )
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( int fd = 20; )
+ CHAZ_QUOTE( char buf[1]; )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( printf("1"); )
+ CHAZ_QUOTE( %s(fd, buf, 1, 1); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
static int
S_probe_pread64(unbuff_combo *combo) {
@@ -335,7 +335,7 @@ S_probe_pread64(unbuff_combo *combo) {
/* Verify compilation. */
sprintf(code_buf, pread64_code, combo->includes, combo->pread64_command);
- output = CC_capture_output(code_buf, &output_len);
+ output = chaz_CC_capture_output(code_buf, &output_len);
if (output != NULL) {
success = true;
free(output);
http://git-wip-us.apache.org/repos/asf/lucy/blob/659210f9/charmonizer/src/Charmonizer/Probe/Memory.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/Memory.c b/charmonizer/src/Charmonizer/Probe/Memory.c
index 6854d52..2747979 100644
--- a/charmonizer/src/Charmonizer/Probe/Memory.c
+++ b/charmonizer/src/Charmonizer/Probe/Memory.c
@@ -27,13 +27,13 @@
static const char alloca_code[] =
"#include <%s>\n"
- QUOTE( int main() { )
- QUOTE( void *foo = %s(1); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( void *foo = %s(1); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
void
-Memory_run(void) {
+chaz_Memory_run(void) {
int has_sys_mman_h = false;
int has_alloca_h = false;
int has_malloc_h = false;
@@ -43,7 +43,7 @@ Memory_run(void) {
int has_underscore_alloca = false;
char code_buf[sizeof(alloca_code) + 100];
- ConfWriter_start_module("Memory");
+ chaz_ConfWriter_start_module("Memory");
{
/* OpenBSD needs sys/types.h for sys/mman.h to work and mmap() to be
@@ -56,57 +56,57 @@ Memory_run(void) {
};
if (chaz_HeadCheck_check_many_headers((const char**)mman_headers)) {
has_sys_mman_h = true;
- ConfWriter_add_def("HAS_SYS_MMAN_H", NULL);
+ chaz_ConfWriter_add_def("HAS_SYS_MMAN_H", NULL);
}
}
/* Unixen. */
sprintf(code_buf, alloca_code, "alloca.h", "alloca");
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
has_alloca_h = true;
has_alloca = true;
- ConfWriter_add_def("HAS_ALLOCA_H", NULL);
- ConfWriter_add_def("alloca", "alloca");
+ chaz_ConfWriter_add_def("HAS_ALLOCA_H", NULL);
+ chaz_ConfWriter_add_def("alloca", "alloca");
}
if (!has_alloca) {
sprintf(code_buf, alloca_code, "stdlib.h", "alloca");
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
has_alloca = true;
need_stdlib_h = true;
- ConfWriter_add_def("ALLOCA_IN_STDLIB_H", NULL);
- ConfWriter_add_def("alloca", "alloca");
+ chaz_ConfWriter_add_def("ALLOCA_IN_STDLIB_H", NULL);
+ chaz_ConfWriter_add_def("alloca", "alloca");
}
}
if (!has_alloca) {
sprintf(code_buf, alloca_code, "stdio.h", /* stdio.h is filler */
"__builtin_alloca");
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
has_builtin_alloca = true;
- ConfWriter_add_def("alloca", "__builtin_alloca");
+ chaz_ConfWriter_add_def("alloca", "__builtin_alloca");
}
}
/* Windows. */
if (!(has_alloca || has_builtin_alloca)) {
sprintf(code_buf, alloca_code, "malloc.h", "alloca");
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
has_malloc_h = true;
has_alloca = true;
- ConfWriter_add_def("HAS_MALLOC_H", NULL);
- ConfWriter_add_def("alloca", "alloca");
+ chaz_ConfWriter_add_def("HAS_MALLOC_H", NULL);
+ chaz_ConfWriter_add_def("alloca", "alloca");
}
}
if (!(has_alloca || has_builtin_alloca)) {
sprintf(code_buf, alloca_code, "malloc.h", "_alloca");
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
has_malloc_h = true;
has_underscore_alloca = true;
- ConfWriter_add_def("HAS_MALLOC_H", NULL);
- ConfWriter_add_def("chy_alloca", "_alloca");
+ chaz_ConfWriter_add_def("HAS_MALLOC_H", NULL);
+ chaz_ConfWriter_add_def("chy_alloca", "_alloca");
}
}
- ConfWriter_end_module();
+ chaz_ConfWriter_end_module();
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/659210f9/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c
index fb9bbc6..4998f41 100644
--- a/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c
+++ b/charmonizer/src/Charmonizer/Probe/SymbolVisibility.c
@@ -25,29 +25,29 @@
#include <stdlib.h>
static const char symbol_exporting_code[] =
- QUOTE( %s int exported_function() { )
- QUOTE( return 42; )
- QUOTE( } )
- QUOTE( int main() { )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( %s int exported_function() { )
+ CHAZ_QUOTE( return 42; )
+ CHAZ_QUOTE( } )
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
void
-SymbolVisibility_run(void) {
+chaz_SymbolVisibility_run(void) {
int can_control_visibility = false;
char code_buf[sizeof(symbol_exporting_code) + 100];
- ConfWriter_start_module("SymbolVisibility");
- CC_set_warnings_as_errors(1);
+ chaz_ConfWriter_start_module("SymbolVisibility");
+ chaz_CC_set_warnings_as_errors(1);
/* Windows. */
if (!can_control_visibility) {
char export_win[] = "__declspec(dllexport)";
sprintf(code_buf, symbol_exporting_code, export_win);
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
can_control_visibility = true;
- ConfWriter_add_def("EXPORT", export_win);
- ConfWriter_add_def("IMPORT", "__declspec(dllimport)");
+ chaz_ConfWriter_add_def("EXPORT", export_win);
+ chaz_ConfWriter_add_def("IMPORT", "__declspec(dllimport)");
}
}
@@ -55,21 +55,21 @@ SymbolVisibility_run(void) {
if (!can_control_visibility) {
char export_gcc[] = "__attribute__ ((visibility (\"default\")))";
sprintf(code_buf, symbol_exporting_code, export_gcc);
- if (CC_test_compile(code_buf)) {
+ if (chaz_CC_test_compile(code_buf)) {
can_control_visibility = true;
- ConfWriter_add_def("EXPORT", export_gcc);
- ConfWriter_add_def("IMPORT", NULL);
+ chaz_ConfWriter_add_def("EXPORT", export_gcc);
+ chaz_ConfWriter_add_def("IMPORT", NULL);
}
}
- CC_set_warnings_as_errors(0);
+ chaz_CC_set_warnings_as_errors(0);
/* Default. */
if (!can_control_visibility) {
- ConfWriter_add_def("EXPORT", NULL);
- ConfWriter_add_def("IMPORT", NULL);
+ chaz_ConfWriter_add_def("EXPORT", NULL);
+ chaz_ConfWriter_add_def("IMPORT", NULL);
}
- ConfWriter_end_module();
+ chaz_ConfWriter_end_module();
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/659210f9/charmonizer/src/Charmonizer/Probe/UnusedVars.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/UnusedVars.c b/charmonizer/src/Charmonizer/Probe/UnusedVars.c
index 6231885..dad90df 100644
--- a/charmonizer/src/Charmonizer/Probe/UnusedVars.c
+++ b/charmonizer/src/Charmonizer/Probe/UnusedVars.c
@@ -24,14 +24,14 @@
void
-UnusedVars_run(void) {
- ConfWriter_start_module("UnusedVars");
+chaz_UnusedVars_run(void) {
+ chaz_ConfWriter_start_module("UnusedVars");
/* Write the macros (no test, these are the same everywhere). */
- ConfWriter_add_def("UNUSED_VAR(x)", "((void)x)");
- ConfWriter_add_def("UNREACHABLE_RETURN(type)", "return (type)0");
+ chaz_ConfWriter_add_def("UNUSED_VAR(x)", "((void)x)");
+ chaz_ConfWriter_add_def("UNREACHABLE_RETURN(type)", "return (type)0");
- ConfWriter_end_module();
+ chaz_ConfWriter_end_module();
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/659210f9/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/VariadicMacros.c b/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
index 41cbe53..bdf1506 100644
--- a/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
+++ b/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
@@ -26,56 +26,56 @@
/* Code for verifying ISO-style variadic macros. */
static const char iso_code[] =
- QUOTE( #include "_charm.h" )
- QUOTE( #define ISO_TEST(fmt, ...) \\ )
- " printf(fmt, __VA_ARGS__) \n"
- QUOTE( int main() { )
- QUOTE( Charm_Setup; )
- QUOTE( ISO_TEST("%d %d", 1, 1); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( #define ISO_TEST(fmt, ...) \\ )
+ " printf(fmt, __VA_ARGS__) \n"
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( ISO_TEST("%d %d", 1, 1); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
/* Code for verifying GNU-style variadic macros. */
static const char gnuc_code[] =
- QUOTE( #include "_charm.h" )
- QUOTE( #define GNU_TEST(fmt, args...) printf(fmt, ##args) )
- QUOTE( int main() { )
- QUOTE( Charm_Setup; )
- QUOTE( GNU_TEST("%d %d", 1, 1); )
- QUOTE( return 0; )
- QUOTE( } );
+ CHAZ_QUOTE( #include "_charm.h" )
+ CHAZ_QUOTE( #define GNU_TEST(fmt, args...) printf(fmt, ##args) )
+ CHAZ_QUOTE( int main() { )
+ CHAZ_QUOTE( Charm_Setup; )
+ CHAZ_QUOTE( GNU_TEST("%d %d", 1, 1); )
+ CHAZ_QUOTE( return 0; )
+ CHAZ_QUOTE( } );
void
-VariadicMacros_run(void) {
+chaz_VariadicMacros_run(void) {
char *output;
size_t output_len;
int has_varmacros = false;
int has_iso_varmacros = false;
int has_gnuc_varmacros = false;
- ConfWriter_start_module("VariadicMacros");
+ chaz_ConfWriter_start_module("VariadicMacros");
/* Test for ISO-style variadic macros. */
- output = CC_capture_output(iso_code, &output_len);
+ output = chaz_CC_capture_output(iso_code, &output_len);
if (output != NULL) {
has_varmacros = true;
has_iso_varmacros = true;
- ConfWriter_add_def("HAS_VARIADIC_MACROS", NULL);
- ConfWriter_add_def("HAS_ISO_VARIADIC_MACROS", NULL);
+ chaz_ConfWriter_add_def("HAS_VARIADIC_MACROS", NULL);
+ chaz_ConfWriter_add_def("HAS_ISO_VARIADIC_MACROS", NULL);
}
/* Test for GNU-style variadic macros. */
- output = CC_capture_output(gnuc_code, &output_len);
+ output = chaz_CC_capture_output(gnuc_code, &output_len);
if (output != NULL) {
has_gnuc_varmacros = true;
if (has_varmacros == false) {
has_varmacros = true;
- ConfWriter_add_def("HAS_VARIADIC_MACROS", NULL);
+ chaz_ConfWriter_add_def("HAS_VARIADIC_MACROS", NULL);
}
- ConfWriter_add_def("HAS_GNUC_VARIADIC_MACROS", NULL);
+ chaz_ConfWriter_add_def("HAS_GNUC_VARIADIC_MACROS", NULL);
}
- ConfWriter_end_module();
+ chaz_ConfWriter_end_module();
}