Merge pull request #2241 from bluca/aix_test

Problem: test_stream_exceeds_buffer fails to build on AIX

tests/test_stream_exceeds_buffer.cpp

@@ -34,15 +34,8 @@
 #   include <ws2tcpip.h>
 #   include <stdexcept>
 #   define close closesocket
-#else
-#   include <sys/socket.h>
-#   include <netinet/in.h>
-#   include <arpa/inet.h>
-#   include <unistd.h>
 #endif
 
-#include <zmq.h>
-
 int main()
 {
     const int msgsize = 8193;

tests/testutil.hpp

@@ -69,6 +69,10 @@
 #   include <sys/socket.h>
 #   include <netinet/in.h>
 #   include <arpa/inet.h>
+#   if defined (ZMQ_HAVE_AIX)
+#      include <sys/types.h>
+#      include <sys/socketvar.h>
+#   endif
 #endif
 
 //  Bounce a message from client to server and back