git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c61ff6
)
librpc: align nstring and nstring_array to 2 byte
author
Stefan Metzmacher
<metze@samba.org>
Tue, 22 Feb 2011 14:57:21 +0000
(15:57 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Sat, 5 Mar 2011 13:34:55 +0000
(14:34 +0100)
metze
(cherry picked from commit
712ef2590d0ee59a4a659926cdf8aac6e968dfa8
)
(cherry picked from commit
0fb64a26b3b35b75f2f548d882bed41aa0386c6b
)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
c26be77576e13582c7d51fe84f4c69f1c1abf28d
)
librpc/idl/idl_types.h
patch
|
blob
|
history
diff --git
a/librpc/idl/idl_types.h
b/librpc/idl/idl_types.h
index 3c6c12cd846a6c0563b01f9dd418f68402eec0a4..88ece20afec2216e64c5759e565e7d2859a9d839 100644
(file)
--- 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