diff --git a/checkin_notes b/checkin_notes index b0f219a961..7eebae5367 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8580,3 +8580,10 @@ David 19 Dec 2003 res/ iconerror.ico (new) iconinfo.ico (new) + +Karl 2003-12-19 + - undid #ifndef for base64. Renamed to r_base64. + + lib/ + parse.h + base64.C diff --git a/lib/base64.C b/lib/base64.C index 213abd57cd..bc04b6dab7 100644 --- a/lib/base64.C +++ b/lib/base64.C @@ -50,7 +50,7 @@ static short base64_char_to_value[128] = The octets are divided into 6 bit chunks, which are then encoded into base64 characters. */ -string base64_encode (const char* from, size_t length) throw(InvalidBase64Exception) +string r_base64_encode (const char* from, size_t length) throw(InvalidBase64Exception) { string result; result.reserve(length + length/3 + 1); @@ -112,7 +112,7 @@ string base64_encode (const char* from, size_t length) throw(InvalidBase64Except } \ while (IS_BASE64_IGNORABLE (c)) -string base64_decode (const char* from, size_t length) throw(InvalidBase64Exception) +string r_base64_decode (const char* from, size_t length) throw(InvalidBase64Exception) { size_t i = 0; string result; diff --git a/lib/parse.h b/lib/parse.h index 245e4ae735..499e08534d 100644 --- a/lib/parse.h +++ b/lib/parse.h @@ -42,7 +42,6 @@ extern void replace_element(char* buf, char* start, char* end, char* replacement extern char* sgets(char* buf, int len, char* &in); extern bool extract_xml_record(const std::string &field, const char *tag, std::string &record); -#ifndef _WIN32 class InvalidBase64Exception { }; @@ -53,4 +52,3 @@ inline string base64_decode (string const& from) throw(InvalidBase64Exception) { return base64_decode(from.c_str(), from.length()); } -#endif