mingw compatibility fixes Modified: trunk/irc/ArchBlackmann/File.cpp Modified: trunk/irc/ArchBlackmann/File.h Modified: trunk/irc/ArchBlackmann/auto_vector.h Modified: trunk/irc/ArchBlackmann/ssprintf.cpp _____
Modified: trunk/irc/ArchBlackmann/File.cpp --- trunk/irc/ArchBlackmann/File.cpp 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/File.cpp 2005-08-19 21:21:05 UTC (rev 17443) @@ -14,8 +14,8 @@
#define nelem(x) ( sizeof(x) / sizeof(x[0]) ) #endif//nelem
-using File::filesize_t; -using File::fileoff_t; +typedef File::filesize_t filesize_t; +typedef File::fileoff_t fileoff_t;
fileoff_t File::seek ( fileoff_t offset ) _____
Modified: trunk/irc/ArchBlackmann/File.h --- trunk/irc/ArchBlackmann/File.h 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/File.h 2005-08-19 21:21:05 UTC (rev 17443) @@ -18,7 +18,7 @@
class File { public: -#ifdef _MSC_VER +#ifdef WIN32 typedef __int64 fileoff_t; typedef unsigned __int64 filesize_t; #else//_MSC_VER _____
Modified: trunk/irc/ArchBlackmann/auto_vector.h --- trunk/irc/ArchBlackmann/auto_vector.h 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/auto_vector.h 2005-08-19 21:21:05 UTC (rev 17443) @@ -53,7 +53,7 @@
{ ASSERT ( i < _end ); reserve ( i + 1 ); - _arr[i].reset ( ptr ); + _arr[i].reset ( p ); }
void push_back ( auto_ptr<T>& p ) _____
Modified: trunk/irc/ArchBlackmann/ssprintf.cpp --- trunk/irc/ArchBlackmann/ssprintf.cpp 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/ssprintf.cpp 2005-08-19 21:21:05 UTC (rev 17443) @@ -551,7 +551,7 @@
return true; }
-static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags) +static int stringa(std::string& f, const char* s, int len, int field_width, int precision, int flags) { int i, done = 0; if (s == NULL) @@ -654,7 +654,7 @@ long double _ldouble; double _double; const char *s; - const unsigned short* sw; + const wchar_t* sw; int result; std::string f;
@@ -793,12 +793,12 @@ case 's': if (qualifier == 'l' || qualifier == 'w') { /* print unicode string */ - sw = va_arg(args, wchar_t *); + sw = (const wchar_t*)va_arg(args, wchar_t *); result = stringw(f, sw, -1, field_width, precision, flags); } else { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } if (result < 0) { @@ -811,10 +811,10 @@ if (qualifier == 'h') { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } else { /* print unicode string */ - sw = va_arg(args, wchar_t *); + sw = (const wchar_t*)va_arg(args, wchar_t *); result = stringw(f, sw, -1, field_width, precision, flags); } if (result < 0) @@ -846,7 +846,7 @@ s = pas->Buffer; len = pas->Length; } - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } if (result < 0) return -1;