diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-05 13:59:42 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-05 13:59:42 +0000 |
| commit | 8930c7829d044ff6684ae243d748c9182767ce1e (patch) | |
| tree | 0f10e4bcd14d9f877ea00794a1f08b808316efd3 /ACE/ace/OS_NS_stdlib.h | |
| parent | e13def4b4effae8f011eaed8a8324012a54b62ba (diff) | |
| download | ATCD-8930c7829d044ff6684ae243d748c9182767ce1e.tar.gz | |
ChangeLogTag: Thu Nov 5 13:58:25 UTC 2009 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/OS_NS_stdlib.h')
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index f1bf2954b0f..8385df4da44 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -60,7 +60,7 @@ extern "C" { * using the pre-processor. */ -#if !defined (ACE_LACKS_STRTOLL) +#if !defined (ACE_LACKS_STRTOLL) && !defined (ACE_STRTOLL_EQUIVALENT) inline ACE_INT64 ace_strtoll_helper (const char *s, char **ptr, int base) { # if defined (strtoll) @@ -70,9 +70,9 @@ inline ACE_INT64 ace_strtoll_helper (const char *s, char **ptr, int base) return ACE_STD_NAMESPACE::strtoll (s, ptr, base); # endif /* strtoll */ } -#endif /* ACE_LACKS_STRTOLL */ +#endif /* !ACE_LACKS_STRTOLL && !ACE_STRTOLL_EQUIVALENT */ -#if !defined (ACE_LACKS_STRTOULL) +#if !defined (ACE_LACKS_STRTOULL) && !defined (ACE_STRTOULL_EQUIVALENT) inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) { # if defined (strtoull) @@ -82,7 +82,7 @@ inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) return ACE_STD_NAMESPACE::strtoull (s, ptr, base); # endif /* strtoull */ } -#endif /* ACE_LACKS_STRTOULL */ +#endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL |