Skip to content

Commit

Permalink
include: Use #include <.*> in public headers.
Browse files Browse the repository at this point in the history
Required to make the headers installable.

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
  • Loading branch information
Thomas Graf authored and blp committed Nov 12, 2014
1 parent 7748423 commit 1825f2e
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build-aux/check-structs
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/openflow/nicira-ext.h
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.0.h
Expand Up @@ -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
* --------------- --------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.1.h
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.2.h
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.3.h
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.4.h
Expand Up @@ -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>


/* ## ---------- ## */
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-1.5.h
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion include/openflow/openflow-common.h
Expand Up @@ -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. */
Expand Down
12 changes: 6 additions & 6 deletions include/openflow/openflow.h
Expand Up @@ -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 */

0 comments on commit 1825f2e

Please sign in to comment.