ANSI-C headers in test snippets to please g++ (and the rest)

Subject: [PATCH]  (back) towards g++ compilation (in Tru64, and elsewhere)
Message-ID: <44CE6BC7.8060805@iki.fi>

p4raw-id: //depot/metaconfig@28636

diff --git a/U/compline/d_casti32.U b/U/compline/d_casti32.U
index f1b325b..9c94dea 100644 (file)
--- a/U/compline/d_casti32.U
+++ b/U/compline/d_casti32.U
@@ -53,7 +53,7 @@ $cat >try.c <<EOCP
 #endif
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech(s) int s; { exit(3); }
+$signal_t blech(int s) { exit(3); }
 int main()
 {
        $xxx i32;

diff --git a/U/compline/d_castneg.U b/U/compline/d_castneg.U
index 6b59361..8093bf0 100644 (file)
--- a/U/compline/d_castneg.U
+++ b/U/compline/d_castneg.U
@@ -64,11 +64,11 @@ $cat >try.c <<EOCP
 #endif
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech(s) int s; { exit(7); }
-$signal_t blech_in_list(s) int s; { exit(4); }
-unsigned long dummy_long(p) unsigned long p; { return p; }
-unsigned int dummy_int(p) unsigned int p; { return p; }
-unsigned short dummy_short(p) unsigned short p; { return p; }
+$signal_t blech(int s) { exit(7); }
+$signal_t blech_in_list(int s) { exit(4); }
+unsigned long dummy_long(unsigned long p) { return p; }
+unsigned int dummy_int(unsigned int p) { return p; }
+unsigned short dummy_short(unsigned short p) { return p; }
 int main()
 {
        double f;

diff --git a/U/compline/nblock_io.U b/U/compline/nblock_io.U
index e4b4781..269796c 100644 (file)
--- a/U/compline/nblock_io.U
+++ b/U/compline/nblock_io.U
@@ -166,7 +166,7 @@ extern int errno;
 #else
 #include <strings.h>
 #endif
-$signal_t blech(x) int x; { exit(3); }
+$signal_t blech(int x) { exit(3); }
 EOCP
        $cat >> try.c <<'EOCP'
 int main()

diff --git a/U/perl/d_fcntl_can_lock.U b/U/perl/d_fcntl_can_lock.U
index e77a3af..25d2d3d 100644 (file)
--- a/U/perl/d_fcntl_can_lock.U
+++ b/U/perl/d_fcntl_can_lock.U
@@ -34,7 +34,7 @@ $cat >try.c <<EOCP
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
-$signal_t blech(x) int x; { exit(3); }
+$signal_t blech(int x) { exit(3); }
 int main() {
 #if defined(F_SETLK) && defined(F_SETLKW)
      struct flock flock;

diff --git a/U/perl/d_u32align.U b/U/perl/d_u32align.U
index 3237a9b..6a47c91 100644 (file)
--- a/U/perl/d_u32align.U
+++ b/U/perl/d_u32align.U
@@ -39,7 +39,7 @@ case "$d_u32align" in
 #define U8 $u8type
 #include <signal.h>
 #ifdef SIGBUS
-$signal_t bletch(s) int s; { exit(4); }
+$signal_t bletch(int s) { exit(4); }
 #endif
 int main() {
 #if BYTEORDER == 0x1234 || BYTEORDER == 0x4321

diff --git a/U/perl/perlxv.U b/U/perl/perlxv.U
index 376f923..4fdbd5e 100644 (file)
--- a/U/perl/perlxv.U
+++ b/U/perl/perlxv.U
@@ -409,7 +409,7 @@ $cat <<EOP >try.c
 #include <signal.h>
 #ifdef SIGFPE
 $volatile int bletched = 0;
-$signal_t blech(s) int s; { bletched = 1; }
+$signal_t blech(int s) { bletched = 1; }
 #endif
 int main() {
     $uvtype u = 0;
@@ -481,7 +481,7 @@ $cat <<EOP >try.c
 #include <signal.h>
 #ifdef SIGFPE
 $volatile int bletched = 0;
-$signal_t blech(s) int s; { bletched = 1; }
+$signal_t blech(int s) { bletched = 1; }
 #endif
 
 int checkit($nvtype d, char *where) {

diff --git a/U/perl/selectminbits.U b/U/perl/selectminbits.U
index a1252c8..55fb003 100644 (file)
--- a/U/perl/selectminbits.U
+++ b/U/perl/selectminbits.U
@@ -75,7 +75,7 @@ $selecttype b;
 #define NBYTES (S * 8 > MINBITS ? S : MINBITS/8)
 #define NBITS  (NBYTES * 8)
 int main() {
-    char *s = malloc(NBYTES);
+    char *s = (char *)malloc(NBYTES);
     struct timeval t;
     int i;
     FILE* fp;