aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-07-20 00:13:15 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-07-20 00:13:15 +0000
commit329b86c53d1765d5486867b09c949e8153943da5 (patch)
tree9ecf67ec4be4a6e06a4d158c8b3528f7099f85e8 /include
parenta246ce557ac01eb6216269c745bda4df49684c5e (diff)
move strtoq into new string files (bug #4740)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6171 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rwxr-xr-xinclude/asterisk/strings.h11
-rwxr-xr-xinclude/solaris-compat/compat.h2
2 files changed, 11 insertions, 2 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 70131cd9d..b20a30733 100755
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -198,6 +198,7 @@ struct ast_realloca {
})
#define HAVE_VASPRINTF
+#define HAVE_STRTOQ
#ifdef __linux__
#define HAVE_STRCASESTR
@@ -207,6 +208,12 @@ struct ast_realloca {
#ifdef SOLARIS
#undef HAVE_VASPRINTF
+#undef HAVE_STRTOQ
+#endif
+
+#ifdef __CYGWIN__
+#undef HAVE_STRTOQ
+typedef unsigned long long uint64_t;
#endif
#ifndef HAVE_STRCASESTR
@@ -225,4 +232,8 @@ size_t strnlen(const char *, size_t);
int vasprintf(char **strp, const char *fmt, va_list ap);
#endif
+#ifndef HAVE_STRTOQ
+uint64_t strtoq(const char *nptr, char **endptr, int base);
+#endif
+
#endif /* _ASTERISK_STRINGS_H */
diff --git a/include/solaris-compat/compat.h b/include/solaris-compat/compat.h
index 3f448117d..b34cf11f4 100755
--- a/include/solaris-compat/compat.h
+++ b/include/solaris-compat/compat.h
@@ -41,8 +41,6 @@ typedef unsigned int u_int32_t;
#endif
char* strsep(char** str, const char* delims);
-uint64_t
-strtoq(const char *nptr, char **endptr, int base);
int setenv(const char *name, const char *value, int overwrite);
int unsetenv(const char *name);
#endif