summaryrefslogtreecommitdiff
path: root/lib/replace
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2010-10-22 10:23:23 +0400
committerMatthieu Patou <mat@matws.net>2010-10-26 23:59:55 +0400
commit62eb450bc24dd1a79074659e91fe87394f780cf8 (patch)
tree3d781e27114ce48a9aca7dac111d61b6c8ed3bb2 /lib/replace
parentba6afbdfb7e8c4a3b047bda134c0887e5b16aeb4 (diff)
downloadsamba-62eb450bc24dd1a79074659e91fe87394f780cf8.tar.gz
samba-62eb450bc24dd1a79074659e91fe87394f780cf8.tar.bz2
samba-62eb450bc24dd1a79074659e91fe87394f780cf8.zip
replace: restore the order for #define + rep_strtoll
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/replace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 15ec80a97d..f738658ffe 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -286,12 +286,12 @@ char *rep_strtok_r(char *s, const char *delim, char **save_ptr);
#ifndef HAVE_STRTOLL
-long long int rep_strtoll(const char *str, char **endptr, int base);
#define strtoll rep_strtoll
+long long int rep_strtoll(const char *str, char **endptr, int base);
#else
#ifdef HAVE_BSD_STRTOLL
-long long int rep_strtoll(const char *str, char **endptr, int base);
#define strtoll rep_strtoll
+long long int rep_strtoll(const char *str, char **endptr, int base);
#endif
#endif
@@ -300,8 +300,8 @@ long long int rep_strtoll(const char *str, char **endptr, int base);
unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
#else
#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
+unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
#endif
#endif