diff options
| author | Paul Eggert | 2011-03-26 19:32:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-26 19:32:40 -0700 |
| commit | 4a843dd730dc1d209fb759136460dc411b299616 (patch) | |
| tree | 6270452d0e918d57b080d53e5417d602aea96e59 /src/floatfns.c | |
| parent | ffa8c828c6c76d3c246443a6752f1038eab60413 (diff) | |
| parent | 9af30bdf17f8371664bc0c5854c91c2e46257b5e (diff) | |
| download | emacs-4a843dd730dc1d209fb759136460dc411b299616.tar.gz emacs-4a843dd730dc1d209fb759136460dc411b299616.zip | |
Merge from mainline.
Diffstat (limited to 'src/floatfns.c')
| -rw-r--r-- | src/floatfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/floatfns.c b/src/floatfns.c index bc03509b757..1232fc0afa1 100644 --- a/src/floatfns.c +++ b/src/floatfns.c | |||
| @@ -103,7 +103,7 @@ extern double logb (double); | |||
| 103 | #endif | 103 | #endif |
| 104 | 104 | ||
| 105 | #ifdef FLOAT_CATCH_SIGILL | 105 | #ifdef FLOAT_CATCH_SIGILL |
| 106 | static SIGTYPE float_error (); | 106 | static void float_error (); |
| 107 | #endif | 107 | #endif |
| 108 | 108 | ||
| 109 | /* Nonzero while executing in floating point. | 109 | /* Nonzero while executing in floating point. |
| @@ -126,7 +126,7 @@ static const char *float_error_fn_name; | |||
| 126 | Handle errors which may result in signals or may set errno. | 126 | Handle errors which may result in signals or may set errno. |
| 127 | 127 | ||
| 128 | Note that float_error may be declared to return void, so you can't | 128 | Note that float_error may be declared to return void, so you can't |
| 129 | just cast the zero after the colon to (SIGTYPE) to make the types | 129 | just cast the zero after the colon to (void) to make the types |
| 130 | check properly. */ | 130 | check properly. */ |
| 131 | 131 | ||
| 132 | #ifdef FLOAT_CHECK_ERRNO | 132 | #ifdef FLOAT_CHECK_ERRNO |
| @@ -960,7 +960,7 @@ Rounds the value toward zero. */) | |||
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | #ifdef FLOAT_CATCH_SIGILL | 962 | #ifdef FLOAT_CATCH_SIGILL |
| 963 | static SIGTYPE | 963 | static void |
| 964 | float_error (signo) | 964 | float_error (signo) |
| 965 | int signo; | 965 | int signo; |
| 966 | { | 966 | { |