diff options
| author | John Högberg <[email protected]> | 2019-03-01 08:36:00 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-03-01 08:36:00 +0100 |
| commit | a94b54d45621dd4cb4b66983325493fc2878edc9 (patch) | |
| tree | d93d76e4b6e60bbf9181b43820d7be43494cc3cc | |
| parent | d4229d29cb4737ac74e126a197812ab60a9b556c (diff) | |
| parent | 4fe2bd4f66d1ae82c0d2842837edafe9e6febfc9 (diff) | |
| download | otp-a94b54d45621dd4cb4b66983325493fc2878edc9.tar.gz otp-a94b54d45621dd4cb4b66983325493fc2878edc9.tar.bz2 otp-a94b54d45621dd4cb4b66983325493fc2878edc9.zip | |
Merge branch 'john/erts/fix-build-openindiana/OTP-15641'
* john/erts/fix-build-openindiana/OTP-15641:
erts: Fix erl_printf on Solaris
erts: Stop using madvise(2) on Solaris
| -rw-r--r-- | erts/emulator/sys/common/erl_mmap.h | 2 | ||||
| -rw-r--r-- | erts/lib_src/common/erl_printf.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h index e1ff0fe80a..3085bf7e19 100644 --- a/erts/emulator/sys/common/erl_mmap.h +++ b/erts/emulator/sys/common/erl_mmap.h @@ -203,7 +203,7 @@ ERTS_GLB_INLINE void erts_mem_discard(void *p, UWord size); data[i] = pattern[i % sizeof(pattern)]; } } -#elif defined(HAVE_SYS_MMAN_H) +#elif defined(HAVE_SYS_MMAN_H) && !(defined(__sun) || defined(__sun__)) #include <sys/mman.h> ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) { diff --git a/erts/lib_src/common/erl_printf.c b/erts/lib_src/common/erl_printf.c index 259ba8c81d..86f5da1c40 100644 --- a/erts/lib_src/common/erl_printf.c +++ b/erts/lib_src/common/erl_printf.c @@ -27,6 +27,11 @@ #include "config.h" #endif +#if defined(__sun) || defined(__sun__) + /* For flockfile(3c), putc_unlocked(3c), etc */ + #define __EXTENSIONS__ +#endif + #include <string.h> #include "erl_errno.h" #ifdef __WIN32__ |