diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:41:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 09:41:08 +0100 |
| commit | 904aa931871fe2ebe5cc6b14a55f37658e15ee89 (patch) | |
| tree | af3c1cd4286d8c34deaba9e5bdea41925bcc3c01 /src/3rdparty/libtiff/port/libport.h | |
| parent | 2f61f401187d55bb0304591f27792a63a38db00e (diff) | |
| parent | 335dc6af7d24c1731cbd7e03a21e66c70d81760d (diff) | |
Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: I5ef5083941390a0b9d9fe59b63a744e5a1aecf18
Diffstat (limited to 'src/3rdparty/libtiff/port/libport.h')
| -rw-r--r-- | src/3rdparty/libtiff/port/libport.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/3rdparty/libtiff/port/libport.h b/src/3rdparty/libtiff/port/libport.h index d9b0421..ff26263 100644 --- a/src/3rdparty/libtiff/port/libport.h +++ b/src/3rdparty/libtiff/port/libport.h @@ -1,5 +1,3 @@ -/* $Id: libport.h,v 1.5 2015-08-19 02:31:04 bfriesen Exp $ */ - /* * Copyright (c) 2009 Frank Warmerdam * @@ -38,9 +36,18 @@ int strcasecmp(const char *s1, const char *s2); # define HAVE_GETOPT 1 #endif -#if 0 +#if HAVE_STRTOL +long strtol(const char *nptr, char **endptr, int base); +#endif +#if HAVE_STRTOLL +long long strtoll(const char *nptr, char **endptr, int base); +#endif +#if HAVE_STRTOUL unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#if HAVE_STRTOULL +unsigned long long strtoull(const char *nptr, char **endptr, int base); +#endif #if 0 void * |