------------------------------------------------------------ revno: 13429 revision-id: kinkie@squid-cache.org-20140601210431-b80nr634t42f2qdz parent: kinkie@squid-cache.org-20140601162130-qtcw5mehtnzr1eaz committer: Francesco Chemolli branch nick: trunk timestamp: Sun 2014-06-01 23:04:31 +0200 message: Copy compat from compat/strtoll.c to Tokenizer.cc ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20140601210431-b80nr634t42f2qdz # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 3170caeab4d2cceb3a37120f3bfe7f3cda4e7c4b # timestamp: 2014-06-01 21:53:54 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20140601162130-\ # qtcw5mehtnzr1eaz # # Begin patch === modified file 'src/parser/Tokenizer.cc' --- src/parser/Tokenizer.cc 2014-05-30 12:41:24 +0000 +++ src/parser/Tokenizer.cc 2014-06-01 21:04:31 +0000 @@ -1,6 +1,35 @@ #include "squid.h" #include "parser/Tokenizer.h" +#if HAVE_CTYPE_H +#include +#endif +#if HAVE_ERRNO_H +#include +#endif +#if HAVE_STDINT_H +#include +#endif +#ifndef INT64_MIN +/* Native 64 bit system without strtoll() */ +#if defined(LONG_MIN) && (SIZEOF_LONG == 8) +#define INT64_MIN LONG_MIN +#else +/* 32 bit system */ +#define INT64_MIN -9223372036854775807L-1L +#endif +#endif + +#ifndef INT64_MAX +/* Native 64 bit system without strtoll() */ +#if defined(LONG_MAX) && (SIZEOF_LONG == 8) +#define INT64_MAX LONG_MAX +#else +/* 32 bit system */ +#define INT64_MAX 9223372036854775807L +#endif +#endif + bool Parser::Tokenizer::token(SBuf &returnedToken, const CharacterSet &delimiters) {