diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
| commit | 3b457d49854503807fa019d9c44a9daf6c79dba0 (patch) | |
| tree | 8c1b1e7a2443ac6cb1f1a4a561bf717cc1dd1246 /include | |
| parent | d357cdd882cc0cf6afb15686834f5d9d6efab57f (diff) | |
| parent | 86b965bdab8dc8735c4a846ec09bfbbadfae780b (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/payload.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/datatype.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/datatype.h b/include/datatype.h index 9f8b44ae..9e609cf2 100644 --- a/include/datatype.h +++ b/include/datatype.h @@ -85,8 +85,15 @@ enum byteorder { struct expr; +/** + * enum datatype_flags + * + * @DTYPE_F_ALLOC: datatype is dynamically allocated + * @DTYPE_F_PREFIX: preferred representation for ranges is a prefix + */ enum datatype_flags { DTYPE_F_ALLOC = (1 << 0), + DTYPE_F_PREFIX = (1 << 1), }; /** |