From: Keith Amidon <keith@nicira.com>
Date: Wed, 4 Mar 2009 18:58:53 +0000 (-0800)
Subject: Work around header type clashes in Xen builds
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a851f1d7fae68d19529e94136bb22f32a1ebb9;p=openvswitch

Work around header type clashes in Xen builds
---

diff --git a/include/openflow/datapath-protocol.h b/include/openflow/datapath-protocol.h
index da620791..ec3d7252 100644
--- a/include/openflow/datapath-protocol.h
+++ b/include/openflow/datapath-protocol.h
@@ -36,7 +36,11 @@
 #ifndef OPENFLOW_DATAPATH_PROTOCOL_H
 #define OPENFLOW_DATAPATH_PROTOCOL_H 1
 
+#ifdef __KERNEL__
 #include <linux/types.h>
+#else
+#include <sys/types.h>
+#endif
 #include <linux/if_ether.h>
 
 #define ODP_MAX 256             /* Maximum number of datapaths. */