From: Václav Slavík Date: Sat, 15 Dec 2001 23:17:56 +0000 (+0000) Subject: DJGPP compilation fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/147043343ea6b36fd07f786ab4c5d2d6f6be09e6?ds=sidebyside DJGPP compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/string.h b/include/wx/string.h index 6c035428b1..098df32cf7 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -139,6 +139,8 @@ inline int Stricmp(const char *psz1, const char *psz2) return stricmp(psz1, psz2); #elif defined(__WATCOMC__) return stricmp(psz1, psz2); +#elif defined(__DJGPP__) + return stricmp(psz1, psz2); #elif defined(__EMX__) return stricmp(psz1, psz2); #elif defined(__WXPM__) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 072e4cdf28..7d49daf7c0 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -439,7 +439,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; // define wxStricmp for various compilers without Unicode possibilities #if !defined(wxStricmp) && !wxUSE_UNICODE -# if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__) +# if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__) || defined(__DJGPP__) # define wxStricmp stricmp # define wxStrnicmp strnicmp # elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__)) diff --git a/src/common/string.cpp b/src/common/string.cpp index 41cf6fb8ef..7b9e376870 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -133,7 +133,7 @@ extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy; #endif //compiler #endif // no vsnprintf -#ifdef _AIX +#if defined(_AIX) || defined(__DJGPP__) // AIX has vsnprintf, but there's no prototype in the system headers. extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap); #endif