Merge tag 'v0.18.16'

2014-09-26 11:06:11 +02:00
parent 45310d0cf6 fe45f28204
commit 8547611479
6 changed files with 35 additions and 52 deletions
--- a/test/test_protocol.cxx
+++ b/test/test_protocol.cxx
@@ -8,7 +8,7 @@
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/HelperMacros.h>

-#include <unistd.h>
+#include <stdlib.h>

 static enum ack last_error = ack(-1);