summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-02-22 15:57:21 +0100
committerJeremy Allison <jra@samba.org>2011-02-28 15:54:13 -0800
commit712ef2590d0ee59a4a659926cdf8aac6e968dfa8 (patch)
tree053cb82a3ce8e93bc1fb5aed70f5655c0e4c7c5a
parent84b884eb4bec38b721d6c38704f12d1d2c601bcb (diff)
downloadsamba-712ef2590d0ee59a4a659926cdf8aac6e968dfa8.tar.gz
samba-712ef2590d0ee59a4a659926cdf8aac6e968dfa8.tar.bz2
samba-712ef2590d0ee59a4a659926cdf8aac6e968dfa8.zip
TODO test/review librpc: align nstring and nstring_array to 2 byte
metze
-rw-r--r--librpc/idl/idl_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h
index 3c6c12cd84..88ece20afe 100644
--- a/librpc/idl/idl_types.h
+++ b/librpc/idl/idl_types.h
@@ -12,7 +12,7 @@
/*
a null terminated UCS2 string
*/
-#define nstring [flag(STR_NULLTERM)] string
+#define nstring [flag(STR_NULLTERM|NDR_ALIGN2)] string
/*
an ascii string prefixed with [offset] [length], both 32 bits
@@ -50,7 +50,7 @@
/*
a null terminated UCS2 string
*/
-#define nstring_array [flag(STR_NULLTERM)] string_array
+#define nstring_array [flag(STR_NULLTERM|NDR_ALIGN2)] string_array
#define NDR_NOALIGN LIBNDR_FLAG_NOALIGN
#define NDR_REMAINING LIBNDR_FLAG_REMAINING