fixinc/inclhack.def(libc1_ifdefd_memx) omit #if/#endif pair

From-SVN: r34969
This commit is contained in:
Bruce Korb 2000-07-11 22:20:38 +00:00 committed by Bruce Korb
parent ee138cf89a
commit 4f923eb83d
3 changed files with 20 additions and 13 deletions

View File

@ -14,6 +14,8 @@ Tue Jul 11 16:26:17 2000 Clinton Popetz <cpopetz@cygnus.com>
* fixinc/fixtests.c(double_slash): obsolete
(else_endif_label): likewise
* fixinc/inclhack.def(irix_multiline_cmnt): obsolete
(libc1_ifdefd_memx): correct initial comment
and omit the #if/#endif pair from the memxxx declarations
* fixinc/fixincl.x: regen
2000-07-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>

View File

@ -2267,12 +2267,13 @@ tTestDesc aLibc1_Ifdefd_MemxTests[] = {
*/
const char* apzLibc1_Ifdefd_MemxPatch[] = {
"format",
"%1 || defined(__cplusplus)\n\
%2",
"%1",
"/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
(#if defined\\(__STDC__\\) && __GNUC__ < 2)\n\
#if defined\\(__STDC__\\) && __GNUC__ < 2\n\
(/\\* .* \\*/\n\
extern [a-z_]+ mem)",
extern [a-z_]+ mem.*(\n\
[^#].*)*;)\n\
#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *

View File

@ -622,7 +622,7 @@ fix = {
};
/*
/*
* Remove erroneous parentheses in sym.h on Alpha OSF/1.
*/
fix = {
@ -1279,9 +1279,11 @@ fix = {
};
/* GNU libc1 string.h does not prototype memcpy and memcmp for gcc
versions > 1. That's a problem. This fix will expose the prototype
for C++. */
/*
* GNU libc1 string.h does not prototype memcpy and memcmp for gcc
* versions > 1. That's a problem. This fix will expose the prototype
* for C++.
*/
fix = {
hackname = libc1_ifdefd_memx;
@ -1294,11 +1296,13 @@ fix = {
c_fix = format;
select = "' is a built-in function for gcc 2\\.x\\. \\*/";
bypass = __cplusplus;
c_fix_arg = "%1 || defined(__cplusplus)\n%2";
c_fix_arg = "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n"
"(#if defined\\(__STDC__\\) && __GNUC__ < 2)\n"
"(/\\* .* \\*/\n"
"extern [a-z_]+ mem)";
c_fix_arg = "%1";
c_fix_arg =
'/\* `mem...\' is a built-in function for gcc 2\.x\. \*/' "\n"
'#if defined\(__STDC__\) && __GNUC__ < 2' "\n"
"(/\\* .* \\*/\n"
"extern [a-z_]+ mem.*(\n[^#].*)*;)\n"
"#endif";
test_text =
"/* \\`memcpy' is a built-in function for gcc 2.x. */\n"