[ovs-dev] [PATCH 04/11] lib: Use #include <.*> in public headers

[Thomas Graf]

Required to make the headers installable.

Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
---
 build-aux/check-structs            |  2 +-
 include/openflow/nicira-ext.h      |  4 ++--
 include/openflow/openflow-1.0.h    |  2 +-
 include/openflow/openflow-1.1.h    |  2 +-
 include/openflow/openflow-1.2.h    |  2 +-
 include/openflow/openflow-1.3.h    |  2 +-
 include/openflow/openflow-1.4.h    |  2 +-
 include/openflow/openflow-1.5.h    |  2 +-
 include/openflow/openflow-common.h |  2 +-
 include/openflow/openflow.h        | 12 ++++++------
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build-aux/check-structs b/build-aux/check-structs
index 0428abf..44ffaa7 100755
--- a/build-aux/check-structs
+++ b/build-aux/check-structs
@@ -20,7 +20,7 @@ token = None
 line = ""
 idRe = "[a-zA-Z_][a-zA-Z_0-9]*"
 tokenRe = "#?" + idRe + "|[0-9]+|."
-includeRe = re.compile(r'\s*#include\s+"(openflow/[^#]+)"')
+includeRe = re.compile(r'\s*#include\s+<(openflow/[^#]+)>')
 includePath = ''
 inComment = False
 inDirective = False
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index b20bab3..e749450 100644
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -17,8 +17,8 @@
 #ifndef OPENFLOW_NICIRA_EXT_H
 #define OPENFLOW_NICIRA_EXT_H 1
 
-#include "openflow/openflow.h"
-#include "openvswitch/types.h"
+#include <openflow/openflow.h>
+#include <openvswitch/types.h>
 
 /* The following vendor extensions, proposed by Nicira, are not yet
  * standardized, so they are not included in openflow.h.  Some of them may be
diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 22c4be2..856634a 100644
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -19,7 +19,7 @@
 #ifndef OPENFLOW_OPENFLOW10_H
 #define OPENFLOW_OPENFLOW10_H 1
 
-#include "openflow/openflow-common.h"
+#include <openflow/openflow-common.h>
 
 /* Port number(s)   meaning
  * ---------------  --------------------------------------
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index 8b52b25..ff3928a 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -52,7 +52,7 @@
 #ifndef OPENFLOW_11_H
 #define OPENFLOW_11_H 1
 
-#include "openflow/openflow-common.h"
+#include <openflow/openflow-common.h>
 
 /* OpenFlow 1.1 uses 32-bit port numbers.  Open vSwitch, for now, uses OpenFlow
  * 1.0 port numbers internally.  We map them to OpenFlow 1.0 as follows:
diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h
index f4c97a1..65417d6 100644
--- a/include/openflow/openflow-1.2.h
+++ b/include/openflow/openflow-1.2.h
@@ -53,7 +53,7 @@
 #ifndef OPENFLOW_12_H
 #define OPENFLOW_12_H 1
 
-#include "openflow/openflow-1.1.h"
+#include <openflow/openflow-1.1.h>
 
 /* Error type for experimenter error messages. */
 #define OFPET12_EXPERIMENTER 0xffff
diff --git a/include/openflow/openflow-1.3.h b/include/openflow/openflow-1.3.h
index caae674..142d32c 100644
--- a/include/openflow/openflow-1.3.h
+++ b/include/openflow/openflow-1.3.h
@@ -37,7 +37,7 @@
 #ifndef OPENFLOW_13_H
 #define OPENFLOW_13_H 1
 
-#include "openflow/openflow-1.2.h"
+#include <openflow/openflow-1.2.h>
 
 /*
  * OpenFlow 1.3 modifies the syntax of the following message types:
diff --git a/include/openflow/openflow-1.4.h b/include/openflow/openflow-1.4.h
index 2a765cf..7631e47 100644
--- a/include/openflow/openflow-1.4.h
+++ b/include/openflow/openflow-1.4.h
@@ -37,7 +37,7 @@
 #ifndef OPENFLOW_14_H
 #define OPENFLOW_14_H 1
 
-#include "openflow/openflow-1.3.h"
+#include <openflow/openflow-1.3.h>
 
 
 /* ## ---------- ## */
diff --git a/include/openflow/openflow-1.5.h b/include/openflow/openflow-1.5.h
index 1d4d589..d1245d3 100644
--- a/include/openflow/openflow-1.5.h
+++ b/include/openflow/openflow-1.5.h
@@ -37,7 +37,7 @@
 #ifndef OPENFLOW_15_H
 #define OPENFLOW_15_H 1
 
-#include "openflow/openflow-common.h"
+#include <openflow/openflow-common.h>
 
 /* Group commands */
 enum ofp15_group_mod_command {
diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h
index 3a11725..0915c91 100644
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -50,7 +50,7 @@
 #ifndef OPENFLOW_COMMON_H
 #define OPENFLOW_COMMON_H 1
 
-#include "openvswitch/types.h"
+#include <openvswitch/types.h>
 
 #ifdef SWIG
 #define OFP_ASSERT(EXPR)        /* SWIG can't handle OFP_ASSERT. */
diff --git a/include/openflow/openflow.h b/include/openflow/openflow.h
index b9cbdca..7976fbb 100644
--- a/include/openflow/openflow.h
+++ b/include/openflow/openflow.h
@@ -17,11 +17,11 @@
 #ifndef OPENFLOW_OPENFLOW_H
 #define OPENFLOW_OPENFLOW_H 1
 
-#include "openflow/openflow-1.0.h"
-#include "openflow/openflow-1.1.h"
-#include "openflow/openflow-1.2.h"
-#include "openflow/openflow-1.3.h"
-#include "openflow/openflow-1.4.h"
-#include "openflow/openflow-1.5.h"
+#include <openflow/openflow-1.0.h>
+#include <openflow/openflow-1.1.h>
+#include <openflow/openflow-1.2.h>
+#include <openflow/openflow-1.3.h>
+#include <openflow/openflow-1.4.h>
+#include <openflow/openflow-1.5.h>
 
 #endif /* openflow/openflow.h */
-- 
1.9.3