aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-03-25 05:38:45 +0100
committerBjörn Gustavsson <[email protected]>2014-03-25 05:38:45 +0100
commit6fc35fffb1dd8e56a3f9d8e43e5008f358ec028e (patch)
tree2e723ee5cb666b4a21b86511b13407a4bc9d4511 /erts/emulator
parenta6e415279913338f175f84400dcc99c16bba572b (diff)
parent6e318949a19c7603d23da64f312b96ecf950ee30 (diff)
downloadotp-6fc35fffb1dd8e56a3f9d8e43e5008f358ec028e.tar.gz
otp-6fc35fffb1dd8e56a3f9d8e43e5008f358ec028e.tar.bz2
otp-6fc35fffb1dd8e56a3f9d8e43e5008f358ec028e.zip
Merge branch 'bjorn/erts/zlib-fix'
* bjorn/erts/zlib-fix: zlib: Fix adler32_combine/4 and crc32_combine/4
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/common/zlib_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/drivers/common/zlib_drv.c b/erts/emulator/drivers/common/zlib_drv.c
index 3fe5d282dc..3143e4511d 100644
--- a/erts/emulator/drivers/common/zlib_drv.c
+++ b/erts/emulator/drivers/common/zlib_drv.c
@@ -21,6 +21,9 @@
* ZLib interface for erlang
*
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <stdio.h>
#include <zlib.h>
#include <errno.h>