diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-01 23:03:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:31 -0500 |
| commit | 8bab9322825090952b25aa7e54c9bcd2f367de8d (patch) | |
| tree | 95634bf39f0f2bbd1bdddb39f71c000e798a6ed3 | |
| parent | 46f627ea7afb0ad006efadf593bf202cea05194e (diff) | |
| download | samba-8bab9322825090952b25aa7e54c9bcd2f367de8d.tar.gz samba-8bab9322825090952b25aa7e54c9bcd2f367de8d.tar.bz2 samba-8bab9322825090952b25aa7e54c9bcd2f367de8d.zip | |
r15387: Fix installation of dcerpc headers, remove more instances of uint_t
(This used to be commit 9e9bfd04c6db013453b900e201df9c09e8777a22)
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 | ||||
| -rw-r--r-- | source4/libcli/nbt/libnbt.h | 2 | ||||
| -rw-r--r-- | source4/ntvfs/cifs_posix_cli/cvfs.h | 4 | ||||
| -rw-r--r-- | source4/ntvfs/ntvfs.h | 2 | ||||
| -rw-r--r-- | source4/ntvfs/simple/svfs.h | 4 | ||||
| -rw-r--r-- | source4/param/loadparm.h | 2 | ||||
| -rw-r--r-- | source4/rpc_server/config.mk | 4 |
7 files changed, 13 insertions, 9 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 7880745538..80da0ab2fa 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -55,6 +55,10 @@ my $section_types = { "MANPAGE" => "string", "PRIVATE_PROTO_HEADER" => "string", + "PUBLIC_PROTO_HEADER" => "string", + + + "PUBLIC_HEADERS" => "list", "CFLAGS" => "string" }, diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h index e828beb29f..521c4f52bd 100644 --- a/source4/libcli/nbt/libnbt.h +++ b/source4/libcli/nbt/libnbt.h @@ -74,7 +74,7 @@ struct nbt_name_request { /* shall we allow multiple replies? */ BOOL allow_multiple_replies; - uint_t num_replies; + unsigned int num_replies; struct nbt_name_reply { struct nbt_name_packet *packet; struct socket_address *dest; diff --git a/source4/ntvfs/cifs_posix_cli/cvfs.h b/source4/ntvfs/cifs_posix_cli/cvfs.h index 8e462d99f4..74e7b6c452 100644 --- a/source4/ntvfs/cifs_posix_cli/cvfs.h +++ b/source4/ntvfs/cifs_posix_cli/cvfs.h @@ -13,7 +13,7 @@ struct svfs_private { }; struct svfs_dir { - uint_t count; + unsigned int count; char *unix_dir; struct svfs_dirfile { char *name; @@ -30,6 +30,6 @@ struct svfs_file { struct search_state { struct search_state *next, *prev; uint16_t handle; - uint_t current_index; + unsigned int current_index; struct svfs_dir *dir; }; diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 3d12c5efc9..9069e6c2ac 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -223,7 +223,7 @@ struct ntvfs_context { struct ntvfs_async_state { struct ntvfs_async_state *prev, *next; /* the async handling infos */ - uint_t state; + unsigned int state; void *private_data; void (*send_fn)(struct ntvfs_request *); NTSTATUS status; diff --git a/source4/ntvfs/simple/svfs.h b/source4/ntvfs/simple/svfs.h index 8e462d99f4..74e7b6c452 100644 --- a/source4/ntvfs/simple/svfs.h +++ b/source4/ntvfs/simple/svfs.h @@ -13,7 +13,7 @@ struct svfs_private { }; struct svfs_dir { - uint_t count; + unsigned int count; char *unix_dir; struct svfs_dirfile { char *name; @@ -30,6 +30,6 @@ struct svfs_file { struct search_state { struct search_state *next, *prev; uint16_t handle; - uint_t current_index; + unsigned int current_index; struct svfs_dir *dir; }; diff --git a/source4/param/loadparm.h b/source4/param/loadparm.h index cbd017db7c..5e3bcea523 100644 --- a/source4/param/loadparm.h +++ b/source4/param/loadparm.h @@ -49,7 +49,7 @@ struct parm_struct { void *ptr; BOOL (*special)(const char *, char **); const struct enum_list *enum_list; - uint_t flags; + unsigned int flags; union { BOOL bvalue; int ivalue; diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index 63fb1cefcc..17e5ca8d81 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -209,8 +209,8 @@ PUBLIC_DEPENDENCIES = \ [MODULE::dcerpc_server] INIT_FUNCTION = server_service_rpc_init SUBSYSTEM = service -#PUBLIC_HEADERS = dcerpc_server.h -PRIVATE_PROTO_HEADER = dcerpc_server_proto.h +PUBLIC_HEADERS = dcerpc_server.h +PUBLIC_PROTO_HEADER = dcerpc_server_proto.h OBJ_FILES = \ dcerpc_server.o \ dcerpc_sock.o \ |