From 93a718f6b4cef864a08c0ba0c59349e67680f4c6 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 22 May 2000 04:02:14 +0000 Subject: [PATCH] inclhack.def (sun_malloc): Handle `calloc'. * fixinc/inclhack.def (sun_malloc): Handle `calloc'. (sun_malloc, sysz_stdtypes_for_sun): Add test_text. From-SVN: r34071 --- gcc/ChangeLog | 5 +++++ gcc/fixinc/fixincl.x | 1 + gcc/fixinc/inclhack.def | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 360127e5793..a53a42b4230 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-05-21 Kaveh R. Ghazi + + * fixinc/inclhack.def (sun_malloc): Handle `calloc'. + (sun_malloc, sysz_stdtypes_for_sun): Add test_text. + Sun May 21 16:42:31 2000 Richard Kenner * combine.c (try_combine): Handle i3_subst_into_i2 case when I2 is diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 912a159112a..ab5a38c26be 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -3736,6 +3736,7 @@ const char* apzSun_MallocPatch[] = { "sed", "-e", "s/int[ \t][ \t]*free/void\tfree/g", "-e", "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g", "-e", "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g", + "-e", "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index f8d71910a1a..c952ad7a878 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2039,11 +2039,13 @@ fix = { sed = "s/int[ \t][ \t]*free/void\tfree/g"; sed = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g"; sed = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g"; + sed = "s/char\\([ \t]*\\*[ \t]*calloc\\)/void\\1/g"; test_text = "typedef char *\tmalloc_t;\n" "int \tfree();\n" "char*\tmalloc();\n" + "char*\tcalloc();\n" "char*\trealloc();"; }; @@ -2597,6 +2599,10 @@ fix = { sed = "/[\t ]wchar_t.*;/a\\\n" "#endif\n"; + + test_text = "typedef int size_t; /* ??? */\n" + "typedef int ptrdiff_t; /* result of subtracting two pointers */\n" + "typedef unsigned short wchar_t; /* big enough for biggest char set */\n"; }; -- 2.30.2