summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-10 12:05:15 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-10 15:56:05 +0200
commit2b41f3702fd7f46696bf6eaf96ad1a58b797ec07 (patch)
treeb0be0be584ca64bf6d7132dd45501781bc444d01 /source3
parent13f8674a15a30816ea7d00eed333f18bcf59e4d4 (diff)
downloadsamba-2b41f3702fd7f46696bf6eaf96ad1a58b797ec07.tar.gz
samba-2b41f3702fd7f46696bf6eaf96ad1a58b797ec07.tar.bz2
samba-2b41f3702fd7f46696bf6eaf96ad1a58b797ec07.zip
s3:param: fix compiler warnings with FN_GLOBAL_CONST_STRING()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5dcb92628c..d7141ae6bc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1101,7 +1101,7 @@ static char *lp_string(TALLOC_CTX *ctx, const char *s)
#define FN_GLOBAL_STRING(fn_name,ptr) \
char *lp_ ## fn_name(TALLOC_CTX *ctx) {return(lp_string((ctx), *(char **)(&Globals.ptr) ? *(char **)(&Globals.ptr) : ""));}
#define FN_GLOBAL_CONST_STRING(fn_name,ptr) \
- const char *lp_ ## fn_name(void) {return(*(const char **)(&Globals.ptr) ? *(const char **)(&Globals.ptr) : "");}
+ const char *lp_ ## fn_name(void) {return(*(const char * const *)(&Globals.ptr) ? *(const char * const *)(&Globals.ptr) : "");}
#define FN_GLOBAL_LIST(fn_name,ptr) \
const char **lp_ ## fn_name(void) {return(*(const char ***)(&Globals.ptr));}
#define FN_GLOBAL_BOOL(fn_name,ptr) \