aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-05-31 16:04:36 +0200
committerRickard Green <[email protected]>2016-05-31 16:04:36 +0200
commit5c76bff6187ad03c6a109567129d6e5402a00c39 (patch)
tree6f7a46894cedbadb97638f66355920a858b2ee7b /erts/emulator/test
parent5b844bafd84e606d0b6931011608c563705153ff (diff)
parentd7519ca4a1834fdcdcc3ee9d7adeb8df5a45600d (diff)
downloadotp-5c76bff6187ad03c6a109567129d6e5402a00c39.tar.gz
otp-5c76bff6187ad03c6a109567129d6e5402a00c39.tar.bz2
otp-5c76bff6187ad03c6a109567129d6e5402a00c39.zip
Merge branch 'rickard/dirty_nif_SUITE-win-fix'
* rickard/dirty_nif_SUITE-win-fix: Fix windows
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c b/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
index 1d2a099186..e38bececde 100644
--- a/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
+++ b/erts/emulator/test/dirty_nif_SUITE_data/dirty_nif_SUITE.c
@@ -19,7 +19,9 @@
*/
#include "erl_nif.h"
#include <assert.h>
-#ifndef __WIN32__
+#ifdef __WIN32__
+#include <windows.h>
+#else
#include <unistd.h>
#endif