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 2006/11/11 07:39:02 UTC
svn commit: r473655 - in /lucene/lucy/trunk/charmonizer: ./ src/Charmonizer/
src/Charmonizer/Core/ src/Charmonizer/Probe/
Author: marvin
Date: Fri Nov 10 22:39:01 2006
New Revision: 473655
URL: http://svn.apache.org/viewvc?view=rev&rev=473655
Log:
Remove the constant_prefix, and replace all instances with macro_prefix.
Modified:
lucene/lucy/trunk/charmonizer/charmonize.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
Modified: lucene/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/charmonize.c?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/charmonize.c (original)
+++ lucene/lucy/trunk/charmonizer/charmonize.c Fri Nov 10 22:39:01 2006
@@ -92,7 +92,7 @@
chaz_Probe_set_verbosity(verbosity);
}
chaz_Probe_init(os_name, cc_command, cc_flags, NULL);
- chaz_Probe_set_prefixes("LUCY_", "Lucy_", "lucy_", "lucy_");
+ chaz_Probe_set_prefixes("LUCY_", "lucy_", "lucy_");
/* clean up */
free(infile_str);
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm Fri Nov 10 22:39:01 2006
@@ -32,7 +32,6 @@
chaz_bool_t chaz_ModHand_charm_run_available = false;
FILE* chaz_ModHand_charmony_fh = NULL;
-char *constant_prefix = NULL;
char *macro_prefix = NULL;
char *typedef_prefix = NULL;
char *function_prefix = NULL;
@@ -239,12 +238,6 @@
remove(TRY_SOURCE_PATH);
os->remove_exe(os, TRY_APP_BASENAME);
remove(TARGET_PATH);
-}
-
-void
-chaz_ModHand_shorten_constant(const char *sym)
-{
- append_conf(" #define %s %s%s\n", sym, constant_prefix, sym);
}
void
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm Fri Nov 10 22:39:01 2006
@@ -25,7 +25,6 @@
extern chaz_bool_t chaz_ModHand_charm_run_available;
extern FILE* chaz_ModHand_charmony_fh;
-extern char *chaz_ModHand_constant_prefix;
extern char *chaz_ModHand_macro_prefix;
extern char *chaz_ModHand_typedef_prefix;
extern char *chaz_ModHand_function_prefix;
@@ -74,16 +73,11 @@
#define CHAZ_MODHAND_START_SHORT_NAMES \
append_conf( \
"\n#if defined(%sUSE_SHORT_NAMES) || defined(CHAZ_USE_SHORT_NAMES)\n", \
- chaz_ModHand_constant_prefix)
+ chaz_ModHand_macro_prefix)
#define CHAZ_MODHAND_END_SHORT_NAMES \
append_conf( \
- "#endif /* USE_SHORT_NAMES */\n", chaz_ModHand_constant_prefix)
-
-/* Define a shortened version of a constant symbol (minus the prefix);
- */
-void
-chaz_ModHand_shorten_constant(const char *symbol);
+ "#endif /* USE_SHORT_NAMES */\n", chaz_ModHand_macro_prefix)
/* Define a shortened version of a macro symbol (minus the prefix);
*/
@@ -122,7 +116,6 @@
#define compiler chaz_ModHand_compiler
#define charm_run_available chaz_ModHand_charm_run_available
#define charmony_fh chaz_ModHand_charmony_fh
- #define constant_prefix chaz_ModHand_constant_prefix
#define macro_prefix chaz_ModHand_macro_prefix
#define typedef_prefix chaz_ModHand_typedef_prefix
#define function_prefix chaz_ModHand_function_prefix
@@ -137,7 +130,6 @@
#define test_compile chaz_ModHand_test_compile
#define capture_output chaz_ModHand_capture_output
#define append_conf chaz_ModHand_append_conf
- #define shorten_constant chaz_ModHand_shorten_constant
#define shorten_macro chaz_ModHand_shorten_macro
#define shorten_typedef chaz_ModHand_shorten_typedef
#define shorten_function chaz_ModHand_shorten_function
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm Fri Nov 10 22:39:01 2006
@@ -19,7 +19,7 @@
compiler = CC_new(os, cc_command, cc_flags);
/* don't write short names unless the user so indicates */
- chaz_Probe_set_prefixes("", "", "", "");
+ chaz_Probe_set_prefixes("", "", "");
want_short_names = false;
/* dispatch other tasks */
@@ -47,16 +47,14 @@
}
void
-chaz_Probe_set_prefixes(const char *constant_pre, const char *macro_pre,
- const char* typedef_pre, const char *function_pre)
+chaz_Probe_set_prefixes(char *macro_pre, const char* typedef_pre,
+ const char *function_pre)
{
want_short_names = true;
- free(constant_prefix);
free(macro_prefix);
free(typedef_prefix);
free(function_prefix);
- constant_prefix = strdup(constant_pre);
macro_prefix = strdup(macro_pre);
typedef_prefix = strdup(typedef_pre);
function_prefix = strdup(function_pre);
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm Fri Nov 10 22:39:01 2006
@@ -26,8 +26,8 @@
* By default, they are blank.
*/
void
-chaz_Probe_set_prefixes(const char *constant_prefix, const char *macro_prefix,
- const char *typedef_prefix, const char *function_prefix);
+chaz_Probe_set_prefixes(char *macro_prefix, const char *typedef_prefix,
+ const char *function_prefix);
/* Determine how much feedback Charmonizer provides.
* 0 - silent
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm Fri Nov 10 22:39:01 2006
@@ -65,26 +65,26 @@
append_conf(
"#define %sHAS_FUNC_MACRO\n"
"#define %sFUNC_MACRO %s\n",
- constant_prefix, macro_prefix, macro_text);
+ macro_prefix, macro_prefix, macro_text);
}
/* write out specific defines */
if (has_iso_funcmac) {
- append_conf("#define %sHAS_ISO_FUNC_MACRO\n", constant_prefix);
+ append_conf("#define %sHAS_ISO_FUNC_MACRO\n", macro_prefix);
}
if (has_gnuc_funcmac) {
- append_conf("#define %sHAS_GNUC_FUNC_MACRO\n", constant_prefix);
+ append_conf("#define %sHAS_GNUC_FUNC_MACRO\n", macro_prefix);
}
/* shorten */
if (want_short_names) {
START_SHORT_NAMES;
if (has_iso_funcmac)
- shorten_constant("HAS_ISO_FUNC_MACRO");
+ shorten_macro("HAS_ISO_FUNC_MACRO");
if (has_gnuc_funcmac)
- shorten_constant("HAS_GNUC_FUNC_MACRO");
+ shorten_macro("HAS_GNUC_FUNC_MACRO");
if (has_iso_funcmac || has_gnuc_funcmac) {
- shorten_constant("HAS_FUNC_MACRO");
+ shorten_macro("HAS_FUNC_MACRO");
shorten_macro("FUNC_MACRO");
}
END_SHORT_NAMES;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm Fri Nov 10 22:39:01 2006
@@ -82,7 +82,7 @@
/* test for all POSIX headers in one blast */
if (check_many_headers((const char**)posix_headers)) {
has_posix = true;
- append_conf("#define %sHAS_POSIX\n", constant_prefix);
+ append_conf("#define %sHAS_POSIX\n", macro_prefix);
for (i = 0; posix_headers[i] != NULL; i++) {
keep(posix_headers[i]);
}
@@ -91,8 +91,8 @@
/* test for all c89 headers in one blast */
if (check_many_headers((const char**)c89_headers)) {
has_c89 = true;
- append_conf("#define %sHAS_C89\n", constant_prefix);
- append_conf("#define %sHAS_C90\n", constant_prefix);
+ append_conf("#define %sHAS_C89\n", macro_prefix);
+ append_conf("#define %sHAS_C90\n", macro_prefix);
for (i = 0; c89_headers[i] != NULL; i++) {
keep(c89_headers[i]);
}
@@ -101,7 +101,7 @@
/* append the config with every header detected so far */
for (i = 0; keepers[i] != NULL; i++) {
encode_affirmation(keepers[i]);
- append_conf("#define %s%s\n", constant_prefix, aff_buf);
+ append_conf("#define %s%s\n", macro_prefix, aff_buf);
}
/* shorten */
@@ -109,16 +109,16 @@
START_SHORT_NAMES;
if (has_posix)
- shorten_constant("HAS_POSIX");
+ shorten_macro("HAS_POSIX");
if (has_c89) {
- shorten_constant("HAS_C89");
- shorten_constant("HAS_C90");
+ shorten_macro("HAS_C89");
+ shorten_macro("HAS_C90");
}
for (i = 0; keepers[i] != NULL; i++) {
encode_affirmation(keepers[i]);
- shorten_constant(aff_buf);
+ shorten_macro(aff_buf);
}
END_SHORT_NAMES;
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm Fri Nov 10 22:39:01 2006
@@ -82,9 +82,9 @@
/* document endian-ness */
if (machine_is_big_endian())
- append_conf("#define %sBIG_END\n", constant_prefix);
+ append_conf("#define %sBIG_END\n", macro_prefix);
else
- append_conf("#define %sLITTLE_END\n", constant_prefix);
+ append_conf("#define %sLITTLE_END\n", macro_prefix);
/* Record sizeof() for several common integer types. */
output = capture_output(sizes_code, strlen(sizes_code), &output_len);
@@ -188,11 +188,11 @@
/* write out some conditional defines */
if (has_inttypes)
- append_conf("#define %sHAS_INTTYPES_H\n", constant_prefix);
+ append_conf("#define %sHAS_INTTYPES_H\n", macro_prefix);
if (has_long_long)
- append_conf("#define %sHAS_LONG_LONG\n", constant_prefix);
+ append_conf("#define %sHAS_LONG_LONG\n", macro_prefix);
if (has___int64)
- append_conf("#define %sHAS___INT64\n", constant_prefix);
+ append_conf("#define %sHAS___INT64\n", macro_prefix);
/* write out sizes */
append_conf(
@@ -201,19 +201,19 @@
"#define %sSIZEOF_INT %d\n"
"#define %sSIZEOF_LONG %d\n"
"#define %sSIZEOF_PTR %d\n",
- constant_prefix, sizeof_char,
- constant_prefix, sizeof_short,
- constant_prefix, sizeof_int,
- constant_prefix, sizeof_long,
- constant_prefix, sizeof_ptr
+ macro_prefix, sizeof_char,
+ macro_prefix, sizeof_short,
+ macro_prefix, sizeof_int,
+ macro_prefix, sizeof_long,
+ macro_prefix, sizeof_ptr
);
if (has_long_long) {
append_conf("#define %sSIZEOF_LONG_LONG %d\n",
- constant_prefix, sizeof_long_long);
+ macro_prefix, sizeof_long_long);
}
if (has___int64) {
append_conf("#define %sSIZEOF___INT64 %d\n",
- constant_prefix, sizeof___int64);
+ macro_prefix, sizeof___int64);
}
/* write affirmations, typedefs and maximums/minimums */
@@ -223,13 +223,13 @@
"#define %sHAS_I8_T\n"
"typedef char %si8_t;\n"
"typedef unsigned char %su8_t;\n",
- constant_prefix, typedef_prefix, typedef_prefix
+ macro_prefix, typedef_prefix, typedef_prefix
);
append_conf(
"#define %sI8_MAX 0x7F\n"
"#define %sI8_MIN (-I8_MAX - 1)\n"
"#define %sU8_MAX (I8_MAX * 2 + 1)\n",
- constant_prefix, constant_prefix, constant_prefix
+ macro_prefix, macro_prefix, macro_prefix
);
}
if (has_16) {
@@ -237,13 +237,13 @@
"#define %sHAS_I16_T\n"
"typedef short %si16_t;\n"
"typedef unsigned short %su16_t;\n",
- constant_prefix, typedef_prefix, typedef_prefix
+ macro_prefix, typedef_prefix, typedef_prefix
);
append_conf(
"#define %sI16_MAX 0x7FFF\n"
"#define %sI16_MIN (-I16_MAX - 1)\n"
"#define %sU16_MAX (I16_MAX * 2 + 1)\n",
- constant_prefix, constant_prefix, constant_prefix
+ macro_prefix, macro_prefix, macro_prefix
);
}
if (has_32) {
@@ -251,7 +251,7 @@
"#define %sHAS_I32_T\n"
"typedef %s %si32_t;\n"
"typedef unsigned %s %su32_t;\n",
- constant_prefix,
+ macro_prefix,
i32_t_type, typedef_prefix,
i32_t_type, typedef_prefix
);
@@ -259,9 +259,9 @@
"#define %sI32_MAX 0x7FFFFFFF%s\n"
"#define %sI32_MIN (-I32_MAX - 1)\n"
"#define %sU32_MAX (I32_MAX * 2%s + 1%s)\n",
- constant_prefix, i32_t_postfix,
- constant_prefix,
- constant_prefix, u32_t_postfix, u32_t_postfix
+ macro_prefix, i32_t_postfix,
+ macro_prefix,
+ macro_prefix, u32_t_postfix, u32_t_postfix
);
}
if (has_64) {
@@ -269,7 +269,7 @@
"#define %sHAS_I64_T\n"
"typedef %s %si64_t;\n"
"typedef unsigned %s %su64_t;\n",
- constant_prefix,
+ macro_prefix,
i64_t_type, typedef_prefix,
i64_t_type, typedef_prefix
);
@@ -277,9 +277,9 @@
"#define %sI64_MAX 0x7FFFFFFFFFFFFFFF%s\n"
"#define %sI64_MIN (-I64_MAX - 1%s)\n"
"#define %sU64_MAX (I64_MAX * 2%s + 1%s)\n",
- constant_prefix, i64_t_postfix,
- constant_prefix, i64_t_postfix,
- constant_prefix, u64_t_postfix, u64_t_postfix
+ macro_prefix, i64_t_postfix,
+ macro_prefix, i64_t_postfix,
+ macro_prefix, u64_t_postfix, u64_t_postfix
);
}
@@ -375,64 +375,64 @@
START_SHORT_NAMES;
if (machine_is_big_endian())
- shorten_constant("BIG_END");
+ shorten_macro("BIG_END");
else
- shorten_constant("LITTLE_END");
+ shorten_macro("LITTLE_END");
- shorten_constant("SIZEOF_CHAR");
- shorten_constant("SIZEOF_SHORT");
- shorten_constant("SIZEOF_LONG");
- shorten_constant("SIZEOF_INT");
- shorten_constant("SIZEOF_PTR");
+ shorten_macro("SIZEOF_CHAR");
+ shorten_macro("SIZEOF_SHORT");
+ shorten_macro("SIZEOF_LONG");
+ shorten_macro("SIZEOF_INT");
+ shorten_macro("SIZEOF_PTR");
if (has_long_long) {
- shorten_constant("HAS_LONG_LONG");
- shorten_constant("SIZEOF_LONG_LONG");
+ shorten_macro("HAS_LONG_LONG");
+ shorten_macro("SIZEOF_LONG_LONG");
}
if (has___int64) {
- shorten_constant("HAS___INT64");
- shorten_constant("SIZEOF___INT64");
+ shorten_macro("HAS___INT64");
+ shorten_macro("SIZEOF___INT64");
}
if (has_inttypes)
- shorten_constant("HAS_INTTYPES_H");
+ shorten_macro("HAS_INTTYPES_H");
shorten_typedef("bool_t");
if (has_8) {
- shorten_constant("HAS_I8_T");
+ shorten_macro("HAS_I8_T");
shorten_typedef("i8_t");
shorten_typedef("u8_t");
- shorten_constant("I8_MAX");
- shorten_constant("I8_MIN");
- shorten_constant("U8_MAX");
+ shorten_macro("I8_MAX");
+ shorten_macro("I8_MIN");
+ shorten_macro("U8_MAX");
}
if (has_16) {
- shorten_constant("HAS_I16_T");
+ shorten_macro("HAS_I16_T");
shorten_typedef("i16_t");
shorten_typedef("u16_t");
- shorten_constant("I16_MAX");
- shorten_constant("I16_MIN");
- shorten_constant("U16_MAX");
+ shorten_macro("I16_MAX");
+ shorten_macro("I16_MIN");
+ shorten_macro("U16_MAX");
}
if (has_32) {
- shorten_constant("HAS_I32_T");
+ shorten_macro("HAS_I32_T");
shorten_typedef("i32_t");
shorten_typedef("u32_t");
- shorten_constant("I32_MAX");
- shorten_constant("I32_MIN");
- shorten_constant("U32_MAX");
+ shorten_macro("I32_MAX");
+ shorten_macro("I32_MIN");
+ shorten_macro("U32_MAX");
shorten_macro("I32_C");
shorten_macro("U32_C");
}
if (has_64) {
- shorten_constant("HAS_I64_T");
+ shorten_macro("HAS_I64_T");
shorten_typedef("i64_t");
shorten_typedef("u64_t");
- shorten_constant("I64_MAX");
- shorten_constant("I64_MIN");
- shorten_constant("U64_MAX");
+ shorten_macro("I64_MAX");
+ shorten_macro("I64_MIN");
+ shorten_macro("U64_MAX");
shorten_macro("I64P");
shorten_macro("U64P");
shorten_macro("I64_C");
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm Fri Nov 10 22:39:01 2006
@@ -76,14 +76,14 @@
/* write the affirmations/definitions */
if (success) {
- append_conf("#define %sHAS_LARGE_FILE_SUPPORT\n", constant_prefix );
+ append_conf("#define %sHAS_LARGE_FILE_SUPPORT\n", macro_prefix );
/* alias these only if they're not already provided and correct */
if (strcmp(off64_type, "off64_t") != 0) {
append_conf(
"#define %soff64_t %s\n"
"#define %sftello64 %s\n"
"#define %sfseeko64 %s\n",
- constant_prefix, off64_type,
+ macro_prefix, off64_type,
function_prefix, ftell_command,
function_prefix, fseek_command
);
@@ -104,11 +104,11 @@
/* short names */
if (want_short_names && success) {
START_SHORT_NAMES;
- shorten_constant("HAS_LARGE_FILE_SUPPORT");
+ shorten_macro("HAS_LARGE_FILE_SUPPORT");
/* alias these only if they're not already provided and correct */
if (strcmp(off64_type, "off64_t") != 0) {
- shorten_constant("off64_t");
+ shorten_macro("off64_t");
shorten_function("ftello64");
shorten_function("fseeko64");
}
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm?view=diff&rev=473655&r1=473654&r2=473655
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm Fri Nov 10 22:39:01 2006
@@ -48,9 +48,9 @@
has_varmacros = true;
has_iso_varmacros = true;
append_conf("#define %sHAS_VARIADIC_MACROS\n",
- constant_prefix);
+ macro_prefix);
append_conf("#define %sHAS_ISO_VARIADIC_MACROS\n",
- constant_prefix);
+ macro_prefix);
}
/* test for GNU-style variadic macros */
@@ -60,21 +60,21 @@
if (has_varmacros == false) {
has_varmacros = true;
append_conf("#define %sHAS_VARIADIC_MACROS\n",
- constant_prefix);
+ macro_prefix);
}
append_conf("#define %sHAS_GNUC_VARIADIC_MACROS\n",
- constant_prefix);
+ macro_prefix);
}
/* shorten */
if (want_short_names) {
START_SHORT_NAMES;
if (has_varmacros)
- shorten_constant("HAS_VARIADIC_MACROS");
+ shorten_macro("HAS_VARIADIC_MACROS");
if (has_iso_varmacros)
- shorten_constant("HAS_ISO_VARIADIC_MACROS");
+ shorten_macro("HAS_ISO_VARIADIC_MACROS");
if (has_gnuc_varmacros)
- shorten_constant("HAS_GNUC_VARIADIC_MACROS");
+ shorten_macro("HAS_GNUC_VARIADIC_MACROS");
END_SHORT_NAMES;
}