aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-10-29 09:45:34 +0100
committerLukas Larsson <[email protected]>2018-10-29 09:45:34 +0100
commitf145ef83ea706ecb560be4f619b3c21c01c5f5b1 (patch)
tree656947ace818d6bff057cd23e4a4564381f6d781
parent6b4de1a87af4910fc4b9a3c5dc4a386985a65f49 (diff)
parent6af0e0dd1edff79a92391dfd1b2fbcba49021f5c (diff)
downloadotp-f145ef83ea706ecb560be4f619b3c21c01c5f5b1.tar.gz
otp-f145ef83ea706ecb560be4f619b3c21c01c5f5b1.tar.bz2
otp-f145ef83ea706ecb560be4f619b3c21c01c5f5b1.zip
Merge branch 'maint'
-rw-r--r--erts/etc/unix/run_erl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 725343d701..bfb3e1bd2c 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -43,10 +43,10 @@
#endif
#ifdef HAVE_WORKING_POSIX_OPENPT
# ifndef _XOPEN_SOURCE
- /* On OS X and BSD, we must leave _XOPEN_SOURCE undefined in order for
- * the prototype of vsyslog() to be included.
+ /* On OS X, BSD and Solaris, we must leave _XOPEN_SOURCE undefined in order
+ * for the prototype of vsyslog() to be included.
*/
-# if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__))
+# if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun))
# define _XOPEN_SOURCE 600
# endif
# endif