lib: try to fix Linux build errors

svn path=/trunk/boinc/; revision=24036
This commit is contained in:
Charlie Fenton 2011-08-24 22:16:19 +00:00
parent 0e7909c97b
commit 4e8c11aad9
2 changed files with 3 additions and 2 deletions

View File

@ -5035,7 +5035,7 @@ Charlie 24 Aug 2011
Charlie 24 Aug 2011
- lib, client: revert recent changes to restore unsigned long long so
we can determine cause of Linux build errors.
we can determine cause of and try to fix Linux build errors.
lib/
parse.h

View File

@ -25,6 +25,7 @@
#include "miofile.h"
#include "str_util.h"
#include "cl_boinc.h"
class XML_PARSER {
bool scan_nonws(int&);
@ -135,7 +136,7 @@ inline bool parse_ulong(const char* buf, const char* tag, unsigned long& x) {
// Same, for unsigned long long
//
inline bool parse_ulonglong(const char* buf, const char* tag, unsigned long long& x) {
inline bool parse_ulonglong(const char* buf, const char* tag, cl_ulong& x) {
const char* p = strstr(buf, tag);
if (!p) return false;
unsigned long long y = strtoull(p+strlen(tag), NULL, 0); // this parses 0xabcd correctly