summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-04 07:36:09 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-04 07:36:09 +0000
commit527e824293ee934ca5da0ef5424efe5ab7757248 (patch)
treedd86fab3b0ba9cdbd86661dfae562fa123a8f53c /source3/param
parent87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 (diff)
downloadsamba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.gz
samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.bz2
samba-527e824293ee934ca5da0ef5424efe5ab7757248.zip
strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.
(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4b89387abf..da25d526a1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2211,7 +2211,7 @@ static BOOL source_env(char **lines)
strncpy(varval, line, len);
varval[len] = '\0';
- p = strchr(line, (int)'=');
+ p = strchr_m(line, (int)'=');
if (p == NULL)
{
DEBUG(4, ("source_env: missing '=': %s\n", line));
@@ -3486,7 +3486,7 @@ int lp_major_announce_version(void)
if ((vers = lp_announce_version()) == NULL)
return major_version;
- if ((p = strchr(vers, '.')) == 0)
+ if ((p = strchr_m(vers, '.')) == 0)
return major_version;
*p = '\0';
@@ -3508,7 +3508,7 @@ int lp_minor_announce_version(void)
if ((vers = lp_announce_version()) == NULL)
return minor_version;
- if ((p = strchr(vers, '.')) == 0)
+ if ((p = strchr_m(vers, '.')) == 0)
return minor_version;
p++;