summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-10-23 11:15:13 -0700
committerTim Prouty <tprouty@samba.org>2008-10-23 12:21:44 -0700
commit0b68762af7055bb3f60e28ab543dcad2736028e9 (patch)
treec6ba0909056f071cdcedc2a6a2aa9a780dcbd8b6
parent215b84903ed202e69241d9fd9494fdc95e911efc (diff)
downloadsamba-0b68762af7055bb3f60e28ab543dcad2736028e9.tar.gz
samba-0b68762af7055bb3f60e28ab543dcad2736028e9.tar.bz2
samba-0b68762af7055bb3f60e28ab543dcad2736028e9.zip
Fix "parameter has incomplete type" build warning.
When libcli-util was moved to the top level (3be0f6ea56ed8e43cd287ed020e942efb675b87b) it introduced a build warning. Since ndr_map_error2ntstatus depends on the definition of enum ndr_err_code and libndr.h can't be easily included in error.h, I moved the definition of enum ndr_err_code to libndr.h. This also eliminates the need for the duplicate definition in proto.h
-rw-r--r--libcli/util/error.h7
-rw-r--r--librpc/ndr/libndr.h5
-rw-r--r--source3/include/proto.h1
3 files changed, 5 insertions, 8 deletions
diff --git a/libcli/util/error.h b/libcli/util/error.h
index 84255448a0..5a7cc1b0b9 100644
--- a/libcli/util/error.h
+++ b/libcli/util/error.h
@@ -46,11 +46,4 @@ WERROR ntstatus_to_werror(NTSTATUS error);
*********************************************************************/
NTSTATUS map_nt_error_from_unix(int unix_error);
-enum ndr_err_code;
-
-/*********************************************************************
- Map an NT error code from a NDR error code.
-*********************************************************************/
-NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err);
-
#endif /* _SAMBA_ERROR_H */
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index bedf41e965..05455da084 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -337,6 +337,11 @@ struct ndr_interface_list {
const struct ndr_interface_table *table;
};
+/*********************************************************************
+ Map an NT error code from a NDR error code.
+*********************************************************************/
+NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err);
+
/* FIXME: Use represent_as instead */
struct dom_sid;
enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 61f864d3eb..7a5cd3b07e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2418,7 +2418,6 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
/* The following definitions come from librpc/ndr/util.c */
-NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err);
enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r);
void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r);