aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sokolov <msokolov@ivan.Harhan.ORG>2001-01-25 05:11:38 +0000
committerMichael Sokolov <msokolov@gcc.gnu.org>2001-01-25 05:11:38 +0000
commitcf480ba7da5dda6ca27d61f3b8d499fcd1ab1ebe (patch)
tree1957da560db51a4d46f5bf77445f7818371002bd
parentdb353c2c695386e32bd065ff1a99a7e761d64612 (diff)
downloadgcc-cf480ba7da5dda6ca27d61f3b8d499fcd1ab1ebe.zip
gcc-cf480ba7da5dda6ca27d61f3b8d499fcd1ab1ebe.tar.gz
gcc-cf480ba7da5dda6ca27d61f3b8d499fcd1ab1ebe.tar.bz2
alarm_.c: Separate the #ifdef KR_headers logic from the G77_alarm_0 function definition.
* libU77/alarm_.c: Separate the #ifdef KR_headers logic from the G77_alarm_0 function definition. Check for SIG_ERR and provide our own if missing. From-SVN: r39256
-rw-r--r--libf2c/ChangeLog6
-rw-r--r--libf2c/libU77/alarm_.c14
2 files changed, 16 insertions, 4 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 30318e7..cdf9fd0 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-24 Michael Sokolov <msokolov@ivan.Harhan.ORG>
+
+ * libU77/alarm_.c: Separate the #ifdef KR_headers logic from the
+ G77_alarm_0 function definition. Check for SIG_ERR and provide our own
+ if missing.
+
2001-01-24 David Billinghurst <David.Billinghurst@riotinto.com>
* libU77/Makefile.in: Explicitly generate a.out for check.
diff --git a/libf2c/libU77/alarm_.c b/libf2c/libU77/alarm_.c
index 3e2f293..e7f9c2d 100644
--- a/libf2c/libU77/alarm_.c
+++ b/libf2c/libU77/alarm_.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001 Free Software Foundation, Inc.
This file is part of GNU Fortran libU77 library.
This library is free software; you can redistribute it and/or modify it
@@ -39,14 +39,20 @@ typedef RETSIGTYPE (*sig_type)();
#ifdef KR_headers
extern sig_type signal();
+#else
+#include <signal.h>
+typedef int (*sig_proc)(int);
+#endif
+
+#ifndef SIG_ERR
+#define SIG_ERR ((sig_type) -1)
+#endif
+#ifdef KR_headers
integer G77_alarm_0 (seconds, proc)
integer *seconds;
sig_type proc;
#else
-#include <signal.h>
-typedef int (*sig_proc)(int);
-
integer G77_alarm_0 (integer *seconds, sig_proc proc)
#endif
{