lib/util: charset modules do not exist any more

[amitay/samba.git] / librpc / idl / idl_types.h

diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h
index 9885ca5bf652f287a8015d6aa3e63d65ba239f20..c50eface0d1282d311bd82602e07ca36a380bcc5 100644 (file)
--- a/librpc/idl/idl_types.h
+++ b/librpc/idl/idl_types.h
@@ -8,34 +8,12 @@
 #define STR_CONFORMANT  LIBNDR_FLAG_STR_CONFORMANT
 #define STR_CHARLEN    LIBNDR_FLAG_STR_CHARLEN
 #define STR_UTF8       LIBNDR_FLAG_STR_UTF8
+#define STR_RAW8       LIBNDR_FLAG_STR_RAW8
 
 /*
   a null terminated UCS2 string
 */
-#define nstring                [flag(STR_NULLTERM)] string
-
-/*
-  an ascii string prefixed with [offset] [length], both 32 bits
-  null terminated
-*/
-#define ascstr2                [flag(STR_ASCII|STR_LEN4)] string
-
-/*
-  an ascii string prefixed with [size], 32 bits
-*/
-#define asclstr                [flag(STR_ASCII|STR_SIZE4)] string
-
-/*
-  an ascii string prefixed with [size], 16 bits
-  null terminated
-*/
-#define ascstr3                [flag(STR_ASCII|STR_SIZE2)] string
-
-/*
-  an ascii string prefixed with [size] [offset] [length], all 32 bits
-  not null terminated
-*/
-#define ascstr_noterm  [flag(STR_NOTERM|STR_ASCII|STR_SIZE4|STR_LEN4)] string
+#define nstring                [flag(STR_NULLTERM|NDR_ALIGN2)] string
 
 /*
   a null terminated ascii string
@@ -47,10 +25,15 @@
 */
 #define utf8string     [flag(STR_UTF8|STR_NULLTERM)] string
 
+/*
+  a null terminated "raw" string (null terminated byte sequence)
+*/
+#define raw8string     [flag(STR_RAW8|STR_NULLTERM)] string
+
 /*
   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
@@ -67,3 +50,6 @@
   this is used to control formatting of uint8 arrays
 */
 #define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX
+
+#define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE
+#define NDR_NO_RELATIVE_REVERSE LIBNDR_FLAG_NO_RELATIVE_REVERSE