git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "next".
[sliver-openvswitch.git]
/
include
/
openflow
/
openflow.h
diff --git
a/include/openflow/openflow.h
b/include/openflow/openflow.h
index
27dae8f
..
b77cd70
100644
(file)
--- a/
include/openflow/openflow.h
+++ b/
include/openflow/openflow.h
@@
-37,12
+37,6
@@
#define OFP_ASSERT BOOST_STATIC_ASSERT
#endif /* __cplusplus */
#define OFP_ASSERT BOOST_STATIC_ASSERT
#endif /* __cplusplus */
-#ifndef SWIG
-#define OFP_PACKED __attribute__((packed))
-#else
-#define OFP_PACKED /* SWIG doesn't understand __attribute. */
-#endif
-
/* Version number:
* Non-experimental versions released: 0x01
* Experimental versions released: 0x81 -- 0x99
/* Version number:
* Non-experimental versions released: 0x01
* Experimental versions released: 0x81 -- 0x99