From e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2005 05:09:35 +0000 Subject: r5298: - got rid of pstring.h from includes.h. This at least makes it a bit less likely that anyone will use pstring for new code - got rid of winbind_client.h from includes.h. This one triggered a huge change, as winbind_client.h was including system/filesys.h and defining the old uint32 and uint16 types, as well as its own pstring and fstring. (This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f) --- source4/build/pidl/server.pm | 10 +++++----- source4/build/pidl/stub.pm | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/build') diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm index e080bf5654..46dada7c7f 100644 --- a/source4/build/pidl/server.pm +++ b/source4/build/pidl/server.pm @@ -103,7 +103,7 @@ static void $name\__op_unbind(struct dcesrv_connection_context *context, const s static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r) { NTSTATUS status; - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; dce_call->fault_code = 0; @@ -129,7 +129,7 @@ static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_C static NTSTATUS $name\__op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r) { - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; switch (opnum) { "; @@ -152,7 +152,7 @@ pidl " static NTSTATUS $name\__op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r) { - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; switch (opnum) { "; @@ -176,7 +176,7 @@ pidl " static NTSTATUS $name\__op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, void *r) { NTSTATUS status; - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; status = dcerpc_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r); if (!NT_STATUS_IS_OK(status)) { @@ -229,7 +229,7 @@ static NTSTATUS $name\__op_init_server(struct dcesrv_context *dce_ctx, const str return NT_STATUS_OK; } -static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version) +static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version) { if ($name\_interface.if_version == if_version && strcmp($name\_interface.uuid, uuid)==0) { diff --git a/source4/build/pidl/stub.pm b/source4/build/pidl/stub.pm index a9c938df63..53be35b216 100644 --- a/source4/build/pidl/stub.pm +++ b/source4/build/pidl/stub.pm @@ -107,7 +107,7 @@ static void $name\__op_unbind(struct dcesrv_connection_context *context, const s static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r) { NTSTATUS status; - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; dce_call->fault_code = 0; @@ -133,7 +133,7 @@ static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_C static NTSTATUS $name\__op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r) { - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; struct GUID ipid = dce_call->pkt.u.request.object.object; struct dcom_interface_p *iface = dcom_get_local_iface_p(&ipid); const struct dcom_$name\_vtable *vtable = iface->vtable; @@ -159,7 +159,7 @@ pidl " static NTSTATUS $name\__op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r) { - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; switch (opnum) { "; @@ -183,7 +183,7 @@ pidl " static NTSTATUS $name\__op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, void *r) { NTSTATUS status; - uint16 opnum = dce_call->pkt.u.request.opnum; + uint16_t opnum = dce_call->pkt.u.request.opnum; status = dcerpc_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r); if (!NT_STATUS_IS_OK(status)) { @@ -236,7 +236,7 @@ static NTSTATUS $name\__op_init_server(struct dcesrv_context *dce_ctx, const str return NT_STATUS_OK; } -static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version) +static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version) { if (dcerpc_table_$name.if_version == if_version && strcmp(dcerpc_table_$name.uuid, uuid)==0) { -- cgit