summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-10-22 08:44:29 +0200
committerStefan Metzmacher <metze@samba.org>2010-10-23 08:49:28 +0200
commitd65896cc3c5e67508e295e6d64193210e958971c (patch)
treed36d23a539ea94847f8079fbdb84700539727815 /lib
parent272feb7bd133344e88864ffc75d251451ddd681c (diff)
downloadsamba-d65896cc3c5e67508e295e6d64193210e958971c.tar.gz
samba-d65896cc3c5e67508e295e6d64193210e958971c.tar.xz
samba-d65896cc3c5e67508e295e6d64193210e958971c.zip
lib/replace: fix rep_strtoull() prototype
metze
Diffstat (limited to 'lib')
-rw-r--r--lib/replace/replace.c2
-rw-r--r--lib/replace/replace.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 5ecda9226f..d9a96ff8ef 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -558,7 +558,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
#else
#ifdef HAVE_BSD_STRTOLL
#ifdef HAVE_STRTOUQ
-long long int rep_strtoull(const char *str, char **endptr, int base)
+unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
{
unsigned long long int nb = strtouq(str, endptr, base);
/* In linux EINVAL is only returned if base is not ok */
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 8f820a949c..15ec80a97d 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -299,8 +299,8 @@ long long int rep_strtoll(const char *str, char **endptr, int base);
#define strtoull rep_strtoull
unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
#else
-#ifdef HAVE_BSD_STRTOLL
-long long int rep_strtoull(const char *str, char **endptr, int base);
+#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
#define strtoull rep_strtoull
#endif
#endif