summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-13 16:09:48 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-13 16:09:48 +0200
commit2049cfe743a2ea4ec1db17b21500b98ba8bab4c7 (patch)
tree0f217c8e2dda3d877151a119f7f3837ff27e6b61
parent2fddd2e2d5fb32ff15a170acc443218481986b91 (diff)
downloadsamba-2049cfe743a2ea4ec1db17b21500b98ba8bab4c7.tar.gz
samba-2049cfe743a2ea4ec1db17b21500b98ba8bab4c7.tar.bz2
samba-2049cfe743a2ea4ec1db17b21500b98ba8bab4c7.zip
Share ndr.c implementation.
-rw-r--r--librpc/ndr/ndr.c (renamed from source4/librpc/ndr/ndr.c)3
-rw-r--r--source3/Makefile.in2
-rw-r--r--source4/librpc/config.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index e8daa99e15..2f1daeaeb5 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -29,8 +29,9 @@
#include "includes.h"
#include "librpc/ndr/libndr.h"
#include "../lib/util/dlinklist.h"
-#include "librpc/gen_ndr/dcerpc.h"
+#if _SAMBA_BUILD_ == 4
#include "param/param.h"
+#endif
#define NDR_BASE_MARSHALL_SIZE 1024
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1685bf141d..cc9efb3918 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -257,7 +257,7 @@ DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
$(COMPRESSION_OBJ)
LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
- librpc/ndr/ndr.o \
+ ../librpc/ndr/ndr.o \
../librpc/ndr/ndr_misc.o \
librpc/gen_ndr/ndr_misc.o \
librpc/gen_ndr/ndr_security.o \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index a481b97a11..9f1d5df96f 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -8,7 +8,7 @@ dcerpcsrcdir = $(librpcsrcdir)/rpc
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
LIBSAMBA-HOSTCONFIG
-LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr.o ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o
+LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o
$(eval $(call proto_header_template,$(ndrsrcdir)/libndr_proto.h,$(LIBNDR_OBJ_FILES:.o=.c)))