aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/common/gzio.c
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-06-08 10:00:48 +0200
committerPatrik Nyblom <[email protected]>2011-12-02 15:21:10 +0100
commitf2fce18b897189a60c518017704bf3b100451a93 (patch)
tree17e77a595f8f0f5c1f20813985b8a346b22abeee /erts/emulator/drivers/common/gzio.c
parent7f9e276476c4939cf3c79f6786abf0b714cee333 (diff)
downloadotp-f2fce18b897189a60c518017704bf3b100451a93.tar.gz
otp-f2fce18b897189a60c518017704bf3b100451a93.tar.bz2
otp-f2fce18b897189a60c518017704bf3b100451a93.zip
Get cerl and distribution working in Win64
Can still not setup -a, but cerl works.
Diffstat (limited to 'erts/emulator/drivers/common/gzio.c')
-rw-r--r--erts/emulator/drivers/common/gzio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c
index 741cb6ae20..a9303d55bc 100644
--- a/erts/emulator/drivers/common/gzio.c
+++ b/erts/emulator/drivers/common/gzio.c
@@ -27,7 +27,9 @@
#endif
#ifdef __WIN32__
+#ifndef HAVE_CONFLICTING_FREAD_DECLARATION
#define HAVE_CONFLICTING_FREAD_DECLARATION
+#endif
#define FILENAMES_16BIT 1
#endif