moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Use the strtoofft.h header file from the lib directory, as we are now

Browse Source 
officially using library-code when building the app (at least for the platforms
that don't have a strtoll() on their own).
This commit is contained in:
Daniel Stenberg 2004-02-19 08:13:20 +00:00
parent 0bf1bd51c4
commit edd467a12c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -22,10 +22,12 @@
########################################################################### ###########################################################################
AUTOMAKE_OPTIONS = foreign nostdinc AUTOMAKE_OPTIONS = foreign nostdinc
# we use srcdir/src for "private" includes
# we use srcdir/include for the static global include files # we use srcdir/include for the static global include files
# we use builddir/src for the generated src/config.h file to get found # we use builddir/src for the generated include files to get found
# we use srcdir/lib for the client-private header files # we use srcdir/lib for the header files we "borrow" from the lib
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/src -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
-I$(top_srcdir)/lib
bin_PROGRAMS = curl bin_PROGRAMS = curl

10
src/main.c
View File

@ -99,12 +99,14 @@
#include <sys/poll.h> #include <sys/poll.h>
#endif #endif
#include <strtoofft.h> /* header from the libcurl directory */
/* The last #include file should be: */ /* The last #include file should be: */
#ifdef CURLDEBUG #ifdef CURLDEBUG
/* This is low-level hard-hacking memory leak tracking and similar. Using /* This is low-level hard-hacking memory leak tracking and similar. Using
the library level code from this client-side is ugly, but we do this the library level code from this client-side is ugly, but we do this
anyway for convenience. */ anyway for convenience. */
#include "../lib/memdebug.h" #include "memdebug.h"
#endif #endif
#define DEFAULT_MAXREDIRS 50L #define DEFAULT_MAXREDIRS 50L
@ -1011,12 +1013,8 @@ static int str2offset(curl_off_t *val, char *str)
#define LLONG_MIN (curl_off_t)0x8000000000000000LL #define LLONG_MIN (curl_off_t)0x8000000000000000LL
#endif #endif
#ifdef HAVE_STRTOLL
*val = strtoll(str, NULL, 0);
#else
/* this is a duplicate of the function that is also used in libcurl */ /* this is a duplicate of the function that is also used in libcurl */
*val = Curl_strtoll(str, NULL, 0); *val = strtoofft(str, NULL, 0);
#endif
if ((*val == LLONG_MAX || *val == LLONG_MIN) && errno == ERANGE) if ((*val == LLONG_MAX || *val == LLONG_MIN) && errno == ERANGE)
return 1; return 1;