summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-12 02:59:30 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-12 02:59:30 +0200
commit5237369ad8bac6a5fc80e32b313ce9f3266abc0f (patch)
tree9709b9b094d1defa0c9fc3a86996e22a546fdd30
parentc4d3dc849f48a75653d1b16031e9c0657df4d098 (diff)
downloadsamba-5237369ad8bac6a5fc80e32b313ce9f3266abc0f.tar.gz
samba-5237369ad8bac6a5fc80e32b313ce9f3266abc0f.tar.bz2
samba-5237369ad8bac6a5fc80e32b313ce9f3266abc0f.zip
Fix warning, prototype.
-rw-r--r--source3/include/proto.h2
-rw-r--r--source4/lib/socket/socket.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3a7400657e..08c1e2c810 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1662,7 +1662,7 @@ int fstr_sprintf(fstring s, const char *fmt, ...);
char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
bool str_list_compare(char **list1, char **list2);
-size_t str_list_length( const char **list );
+size_t str_list_length( const char * const*list );
bool str_list_sub_basic( char **list, const char *smb_name,
const char *domain_name );
bool str_list_substitute(char **list, const char *pattern, const char *insert);
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 92f0a44005..0c3d032068 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -491,7 +491,7 @@ static const struct {
**/
_PUBLIC_ void set_socket_options(int fd, const char *options)
{
- const char **options_list = str_list_make(NULL, options, " \t,");
+ const char **options_list = (const char **)str_list_make(NULL, options, " \t,");
int j;
if (!options_list)