diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
| commit | ea3024202d8dfedfafa62a15286157d3843957cb (patch) | |
| tree | 35e3bb9c80eba604aa7bcd460c657658171cda20 /erts/emulator/sys | |
| parent | 60c5ebfa0f56b5e1791b2fd408c243d6a280a393 (diff) | |
| parent | 691f8f7f180e970aea155d1741cd9f5e66741a20 (diff) | |
| download | otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.gz otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.bz2 otp-ea3024202d8dfedfafa62a15286157d3843957cb.zip | |
Merge branch 'nox/fix-warnings/OTP-11086' into maint
* nox/fix-warnings/OTP-11086:
Fix some sign warnings found with Clang
Fix a shift/reduce conflicts warning in icparse
Fix two deprecation warnings in com.ericsson.otp.ic.Environment
Define matherr only on platforms where it is used
Properly declare _sigaction on Darwin
Properly mark Uint literals as unsigned in big.c
Do not use -mdynamic-no-pic on Darwin
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/sys_float.c | 4 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys_float.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c index 787f8d6728..689be98969 100644 --- a/erts/emulator/sys/unix/sys_float.c +++ b/erts/emulator/sys/unix/sys_float.c @@ -832,6 +832,8 @@ sys_chars_to_double(char* buf, double* fp) return 0; } +#ifdef USE_MATHERR + int matherr(struct exception *exc) { @@ -842,3 +844,5 @@ matherr(struct exception *exc) #endif return 1; } + +#endif diff --git a/erts/emulator/sys/win32/sys_float.c b/erts/emulator/sys/win32/sys_float.c index fb1ffc3089..e2a777d182 100644 --- a/erts/emulator/sys/win32/sys_float.c +++ b/erts/emulator/sys/win32/sys_float.c @@ -133,6 +133,8 @@ sys_double_to_chars_ext(double fp, char *buffer, size_t buffer_size, size_t deci return s-buffer; /* i.e strlen(buffer) */ } +#ifdef USE_MATHERR + int matherr(struct _exception *exc) { @@ -141,6 +143,8 @@ matherr(struct _exception *exc) return 1; } +#endif + static void fpe_exception(int sig) { |