git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba6afbd
)
replace: restore the order for #define + rep_strtoll
author
Matthieu Patou
<mat@matws.net>
Fri, 22 Oct 2010 06:23:23 +0000
(10:23 +0400)
committer
Matthieu Patou
<mat@matws.net>
Tue, 26 Oct 2010 19:59:55 +0000
(23:59 +0400)
lib/replace/replace.h
patch
|
blob
|
history
diff --git
a/lib/replace/replace.h
b/lib/replace/replace.h
index 15ec80a97d3ca9738b67e497521503b180c0eec2..f738658ffef8f3b565835f0470ff203d07c01dc1 100644
(file)
--- 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
#ifndef HAVE_STRTOLL
-long long int rep_strtoll(const char *str, char **endptr, int base);
#define strtoll rep_strtoll
#define strtoll rep_strtoll
+long long int rep_strtoll(const char *str, char **endptr, int base);
#else
#ifdef HAVE_BSD_STRTOLL
#else
#ifdef HAVE_BSD_STRTOLL
-long long int rep_strtoll(const char *str, char **endptr, int base);
#define strtoll rep_strtoll
#define strtoll rep_strtoll
+long long int rep_strtoll(const char *str, char **endptr, int base);
#endif
#endif
#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);
#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
#define strtoull rep_strtoull
+unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
#endif
#endif
#endif
#endif