Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a bug report; C++Builder compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-11-11 11:01:28 +00:00
parent 1c6fb09fe2
commit cf1d22d685
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/setup0.h
View File

@@ -411,6 +411,13 @@
#define wxUSE_ODBC 0
#endif
// With C++Builder we get lots of doubly-defined symbols
// when including both winsock.h and winsock2.h
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x530)
#undef wxUSE_SOCKETS
#undef wxUSE_SOCKETS 0
#endif
#if defined(__WXMSW__) && defined(__WATCOMC__)
#undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0

8
include/wx/wxchar.h
View File

@@ -169,15 +169,19 @@ typedef _TUCHAR wxUChar;
# endif
// wchar_t is available
# undef wxUSE_WCHAR_T
// This test is for C++Builder
#if __BORLANDC__ == 0x530
# define wxUSE_WCHAR_T 0
#elif
# define wxUSE_WCHAR_T 1
# define wxNEED_WCSLEN
#endif
# define wxNEED_WX_CTYPE_H
// #define wxStrtok strtok_r // Borland C++ 4.52 doesn't have strtok_r
# define wxNEED_WX_STRING_H
# define wxNEED_WX_STDIO_H
# define wxNEED_WX_STDLIB_H
# define wxNEED_WX_TIME_H
# define wxNEED_WCSLEN
#else//!TCHAR-aware compilers