X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/154f22b3facdbca2cb89e091ae2ea1398bfad9d1..7f4791dda9267635f98b1a1f9113f06cab3c257f:/include/wx/msw/setup0.h diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index bcf7216e30..d76043d872 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -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