Rob Shearman : Add configure check for strtoll and strtoull.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e9f5bce333bc7744859aad5c48d3b9d4f5e76658
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e9f5bce333bc7744859aad5c48...

Author: Rob Shearman 
Date:   Mon Mar  3 21:48:18 2008 +0000

Add configure check for strtoll and strtoull.

Define these to _strtoi64 and _strtoui64 if these are available instead.

---

configure           |    8 ++++++++
 configure.ac        |    4 ++++
 include/config.h.in |   12 ++++++++++++
 include/wine/port.h |    8 ++++++++
 4 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 831ac1a..1389645 100755
--- a/configure
+++ b/configure
@@ -16595,6 +16595,10 @@ esac

+
+
+
+
 for ac_func in \
    _pclose \
    _popen \
@@ -16603,6 +16607,8 @@ for ac_func in \
    _strdup \
    _stricmp \
    _strnicmp \
+	_strtoi64 \
+	_strtoui64 \
    _vsnprintf \
    asctime_r \
    chsize \
@@ -16654,6 +16660,8 @@ for ac_func in \
    strerror \
    strncasecmp \
    strtold \
+	strtoll \
+	strtoull \
    tcgetattr \
    thr_kill2 \
    timegm \
diff --git a/configure.ac b/configure.ac
index 4ccc1db..5d06e6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1328,6 +1328,8 @@ AC_CHECK_FUNCS(\
    _strdup \
    _stricmp \
    _strnicmp \
+	_strtoi64 \
+	_strtoui64 \
    _vsnprintf \
    asctime_r \
    chsize \
@@ -1379,6 +1381,8 @@ AC_CHECK_FUNCS(\
    strerror \
    strncasecmp \
    strtold \
+	strtoll \
+	strtoull \
    tcgetattr \
    thr_kill2 \
    timegm \
diff --git a/include/config.h.in b/include/config.h.in
index 1b2c828..ac464db 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -666,6 +666,12 @@
 /* Define to 1 if you have the `strtold' function. */
 #undef HAVE_STRTOLD

+/* Define to 1 if you have the `strtoll' function. */
+#undef HAVE_STRTOLL
+
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
 /* Define to 1 if `direction' is member of `struct ff_effect'. */
 #undef HAVE_STRUCT_FF_EFFECT_DIRECTION

@@ -972,6 +978,12 @@
 /* Define to 1 if you have the `_strnicmp' function. */
 #undef HAVE__STRNICMP

+/* Define to 1 if you have the `_strtoi64' function. */
+#undef HAVE__STRTOI64
+
+/* Define to 1 if you have the `_strtoui64' function. */
+#undef HAVE__STRTOUI64
+
 /* Define to 1 if you have the `_vsnprintf' function. */
 #undef HAVE__VSNPRINTF

diff --git a/include/wine/port.h b/include/wine/port.h
index 4b94a5e..6727891 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -138,6 +138,14 @@ struct statvfs
 #define vsnprintf _vsnprintf
 #endif

+#if !defined(HAVE_STRTOLL) && defined(HAVE__STRTOI64)
+#define strtoll _strtoi64
+#endif
+
+#if !defined(HAVE_STRTOULL) && defined(HAVE__STRTOUI64)
+#define strtoull _strtoui64
+#endif
+
 #ifndef S_ISLNK
 # define S_ISLNK(mod) (0)
 #endif