Fix build on FreeBSD.

Patch below fixes build on FreeBSD; tested on 10.0-CURRENT.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/configure.ac b/configure.ac
index 3b87e7e0c0829a94855b24f34218412263fa028d..7bac8712f8be223f00b9da3323fde53ddddc8541 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ AC_SYS_LARGEFILE
 
 AC_SEARCH_LIBS([pow], [m])
 AC_SEARCH_LIBS([clock_gettime], [rt])
+AC_SEARCH_LIBS([timer_create], [rt])
 
 OVS_CHECK_COVERAGE
 OVS_CHECK_NDEBUG

diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index 696b8ca67f83e13f72c9ce36249ef5736b2e1e15..1242f9ff3f81641c12f41ac658908c5b7d8b40dd 100644 (file)
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -17,6 +17,8 @@
 #ifndef META_FLOW_H
 #define META_FLOW_H 1
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/ip6.h>
 #include "flow.h"
 #include "packets.h"

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 33672c8c4ba4af77336a3af7597da53990125eca..1e20f49db7b9fb7b5361b842ab075cb69b5f459c 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -19,6 +19,7 @@
 #include "odp-util.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index bf03a820ea3123c54b60fb81b445a26b440dd664..b1d35cbb80ae5fe2b8f716fdba1d309620c99e67 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -18,6 +18,8 @@
 #include "ofp-print.h"
 #include <errno.h>
 #include <inttypes.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <stdlib.h>
 #include "autopath.h"

diff --git a/lib/packets.c b/lib/packets.c
index 815d4e66be9d0b0b7b007123ba413e56f7f6d916..b704276caae43dfa3eab59b69127025046c011f3 100644 (file)
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -18,6 +18,7 @@
 #include "packets.h"
 #include <assert.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include "byte-order.h"

diff --git a/ofproto/in-band.h b/ofproto/in-band.h
index f7f2ec656894e2f8365af9b75f2a8acbcda9e56a..9de72ee6406495f1bc7f65825f9ace59013afcd5 100644 (file)
--- a/ofproto/in-band.h
+++ b/ofproto/in-band.h
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 
 struct flow;
 struct in_band;

diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c
index b8f8d7e33036e0956a90cfe5c4bc1f233078c7c1..a3b4db44341c337cb94e2b65f83ed9726f1b4d79 100644 (file)
--- a/vswitchd/system-stats.c
+++ b/vswitchd/system-stats.c
@@ -95,7 +95,11 @@ get_memory_stats(struct shash *stats)
     if (!LINUX) {
         unsigned int pagesize = get_page_size();
         long int phys_pages = sysconf(_SC_PHYS_PAGES);
+#ifdef _SC_AVPHYS_PAGES
         long int avphys_pages = sysconf(_SC_AVPHYS_PAGES);
+#else
+        long int avphys_pages = 0;
+#endif
         int mem_total, mem_used;
 
         if (pagesize <= 0 || phys_pages <= 0 || avphys_pages <= 0) {