summaryrefslogtreecommitdiff
path: root/source4/lib/tdr
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/tdr')
-rw-r--r--source4/lib/tdr/config.mk2
-rw-r--r--source4/lib/tdr/tdr.c6
-rw-r--r--source4/lib/tdr/tdr.h9
3 files changed, 13 insertions, 4 deletions
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index 4160ad1ce9..7ecbab35d1 100644
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -1,7 +1,7 @@
[LIBRARY::TDR]
PUBLIC_HEADERS = tdr.h
VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
DESCRIPTION = Simple marshall/unmarshall library
PUBLIC_PROTO_HEADER = tdr_proto.h
OBJ_FILES = tdr.o
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c
index cd1650e30d..e108473708 100644
--- a/source4/lib/tdr/tdr.c
+++ b/source4/lib/tdr/tdr.c
@@ -129,7 +129,7 @@ NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v)
return NT_STATUS_OK;
}
-NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
{
int ret;
@@ -165,7 +165,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v,
return NT_STATUS_OK;
}
-NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
{
ssize_t ret, required;
@@ -192,7 +192,7 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length,
return NT_STATUS_OK;
}
-NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
{
tdr->print(tdr, "%-25s: %s", name, *v);
return NT_STATUS_OK;
diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h
index 8ca6717cee..4c0280d9d6 100644
--- a/source4/lib/tdr/tdr.h
+++ b/source4/lib/tdr/tdr.h
@@ -18,6 +18,13 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef __TDR_H__
+#define __TDR_H__
+
+#include "core.h"
+#include "lib/talloc/talloc.h"
+#include "charset/charset.h"
+
#define TDR_BIG_ENDIAN 0x01
#define TDR_ALIGN2 0x02
#define TDR_ALIGN4 0x04
@@ -56,3 +63,5 @@ typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *);
typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *);
#include "tdr/tdr_proto.h"
+
+#endif /* __TDR_H__ */