Work around bugs in system headers.

On some system, at least, one must include <sys/types.h> before
<netinet/in.h>, and <netinet/in.h> before <arpa/inet.h> or <net/if.h>.

From Jean Tourrilhes <jt@hpl.hp.com>.

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 1daa93b299aa53f64d05b9ff3ff940669e07c727..2fd2bed3788a16182a82b599a45113a8c811ed43 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -22,8 +22,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <net/if.h>
 #include <netinet/in.h>
+#include <net/if.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>

diff --git a/lib/flow.h b/lib/flow.h
index cb2010996f43ca1183ef4b4d6af4c95629af6cf8..bc6fb913df693afa0c503025fb3a128c94057e5b 100644 (file)
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 #ifndef FLOW_H
 #define FLOW_H 1
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 4997a0a1e209e2d4fb34e081e482a230b4d9bf28..af534386545283410461c30966fc05ddee4747ee 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -19,6 +19,7 @@
 
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/wait.h>
 #include <stdarg.h>

diff --git a/lib/stp.c b/lib/stp.c
index 87230bd9a27fd7c1979b38dc9982f5eaab45cc02..5d35156acb7ccef49e2be0f097fbc1a691ff4f3a 100644 (file)
--- a/lib/stp.c
+++ b/lib/stp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
  * applies to all modifications. */
 
 #include "stp.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <inttypes.h>

diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c
index 306d8516ecc565c5d30a3808e97b8dedf48d68ca..bc7bd1100f9c9efbcfeb2352e22e00922aa6bbe6 100644 (file)
--- a/ofproto/pinsched.c
+++ b/ofproto/pinsched.c
@@ -16,6 +16,8 @@
 
 #include <config.h>
 #include "pinsched.h"
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdint.h>
 #include <stdlib.h>