summaryrefslogtreecommitdiff
path: root/librabbitmq/unix
diff options
context:
space:
mode:
authorAlan Antonuk <aega@med.umich.edu>2012-10-04 15:41:25 -0400
committerAlan Antonuk <aega@med.umich.edu>2012-10-04 15:41:25 -0400
commit321aa1c32d890eafe8018194a80f184b111a379b (patch)
tree5a3475eab0c2cbc56008d6772cdcfd72a05bab9f /librabbitmq/unix
parent50cf6116f5f8e67395bdd8a59990e09b5457a938 (diff)
downloadrabbitmq-c-321aa1c32d890eafe8018194a80f184b111a379b.tar.gz
Correct sys/types.h sys/socket.h include order on *BSD
sys/types.h must be included before sys/socket.h on certain older BSD variants
Diffstat (limited to 'librabbitmq/unix')
-rw-r--r--librabbitmq/unix/socket.c3
-rw-r--r--librabbitmq/unix/socket.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/librabbitmq/unix/socket.c b/librabbitmq/unix/socket.c
index cb8a2b9..5e5ba91 100644
--- a/librabbitmq/unix/socket.c
+++ b/librabbitmq/unix/socket.c
@@ -40,9 +40,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <unistd.h>
int
amqp_socket_init(void)
diff --git a/librabbitmq/unix/socket.h b/librabbitmq/unix/socket.h
index d57cb7b..8620df1 100644
--- a/librabbitmq/unix/socket.h
+++ b/librabbitmq/unix/socket.h
@@ -34,11 +34,11 @@
*/
#include <errno.h>
-#include <netdb.h>
+#include <sys/types.h> /* On older BSD this must come before net includes */
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <sys/socket.h>
-#include <sys/types.h>
+#include <netdb.h>
#include <sys/uio.h>
#include <unistd.h>