From 4e8c11aad9e9af3108a2ebcc3a76eaedef1bed3e Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 24 Aug 2011 22:16:19 +0000 Subject: [PATCH] lib: try to fix Linux build errors svn path=/trunk/boinc/; revision=24036 --- checkin_notes | 2 +- lib/parse.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 0f234efa7d..d1f059ce90 100644 --- a/checkin_notes +++ b/checkin_notes @@ -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 diff --git a/lib/parse.h b/lib/parse.h index 51daeb378c..178a062c95 100644 --- a/lib/parse.h +++ b/lib/parse.h @@ -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