Always #include <sys/socket.h> before <net/if.h>.

FreeBSD 8.0's <net/if.h> requires <sys/socket.h> to be included first,
even though I don't see any such requirement in POSIX.

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 2f4463e6d4783851a1d1d01615b8b53da0c5d462..c4cc6e98357f594124f7ba14199da3f7a3c58c5b 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ofproto/discovery.c b/ofproto/discovery.c
index 2044ea5e4b7df3a61d810d3fbcd73790e63db744..b875890af481286d24cd454d89f4e812d63413c0 100644 (file)
--- a/ofproto/discovery.c
+++ b/ofproto/discovery.c
@@ -18,6 +18,7 @@
 #include "discovery.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <regex.h>
 #include <stdlib.h>

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index e52a0a056f0434115253c2f17b3c497b50f1e3f2..884cf1d26fb70e411803dc3b124c777e292d9325 100644 (file)
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -19,6 +19,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 1010948357e1c763f23eb3f0a83fd9998f272782..069d5e5184630ef21c4aaca7a0c1af84ed3f476e 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -19,6 +19,7 @@
 #include "ofproto.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stdbool.h>

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index ecfb3069ade397fe657900e2f0079738f685afcb..df76e86e87d37af5abd8c0bdd98a7a16a100f0d2 100644 (file)
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <signal.h>

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 1a0c9363e78d42eecb27619a78c22de88eee05d9..96d64b3bb417d6abd70ece60a832123dcd5f882e 100644 (file)
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <signal.h>

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 04898f88d9689787c3f344e692b3fc61417668dd..8314c5392bd2b73c8e332bc1aab336ac551c045d 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -20,6 +20,7 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <inttypes.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <openflow/openflow.h>
 #include <signal.h>