PATCH: fixinc/inclhack.def(libc1_ifdefd_memx)

[Bruce Korb <bkorb at sco dot COM>]

MMDF Mail System wrote:
> 
> Trouble sending mail on sco.sco.COM:
> 
> ============ Transcript follows ============
> 
> Submit error: [ File exists ] unable to move file to mail queue
> 
> ============== Message follows =============


> 2000-07-11  Bruce Korb  <bkorb@gnu.org>
> 
>         * fixinc/inclhack.def(libc1_ifdefd_memx): correct initial comment
>         and omit the #if/#endif pair from the memxxx declarations
> 
> Index: inclhack.def
> ===================================================================
> RCS file: /cvs/gcc/egcs/gcc/fixinc/inclhack.def,v
> retrieving revision 1.82
> diff -u -r1.82 inclhack.def
> --- inclhack.def        2000/07/11 21:13:11     1.82
> +++ inclhack.def        2000/07/11 22:12:04
> @@ -622,7 +622,7 @@
>  };
> 
> 
> -/*
> +/*
>   * Remove erroneous parentheses in sym.h on Alpha OSF/1.
>   */
>  fix = {
> @@ -1279,9 +1279,11 @@
>  };
> 
> 
> -/* 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 or for g++.  Expose the declarations for *all*
> + *  versions of GCC.
> + */
>  fix = {
>      hackname  = libc1_ifdefd_memx;
> 
> @@ -1294,11 +1296,13 @@
>      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"