From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 10 Aug 2012 10:05:15 +0000 (+0200)
Subject: s3:param: fix compiler warnings with FN_GLOBAL_CONST_STRING()
X-Git-Tag: samba-4.0.0beta6~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b41f3702fd7f46696bf6eaf96ad1a58b797ec07;p=thirdparty%2Fsamba.git

s3:param: fix compiler warnings with FN_GLOBAL_CONST_STRING()

metze
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5dcb92628cb..d7141ae6bc8 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) \