Merge remote-tracking branch 'remotes/origin/master' into vb_admesh_fix

2019-06-06 21:01:19 +02:00
parent c7ba48a473 6da1c98139
commit 7dd842b294
11 changed files with 222 additions and 13 deletions
--- a/xs/src/xsinit.h
+++ b/xs/src/xsinit.h
@@ -69,7 +69,10 @@ extern "C" {
    #undef fwrite
    #undef fclose
    #undef sleep
+    #undef snprintf
+    #undef strerror
    #undef test
+    #undef times
    #undef accept
    #undef wait