Merge /u/srachner/zint/ branch master into master

https://sourceforge.net/p/zint/code/merge-requests/4/
2024-11-16 20:57:25 +13:00 · 2017-10-17 16:49:05 +00:00 · 2017-10-17 16:49:05 +00:00 · 50cbbe391b
commit 50cbbe391b
parent f83e5b1501 20ccbcd4e4
1 changed files with 2 additions and 0 deletions
--- a/backend/emf.c
+++ b/backend/emf.c
@ -35,7 +35,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#ifdef _MSC_VER
 #include <malloc.h>
+#endif
 #include "common.h"
 #include "emf.h"