-/* This test added by JACS as a quick fix. What should we do
- * to make it work with configure?
- */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+#if defined(_WIN32)
#include "jconfig.vc"
#else
/* use wxWidgets' configure */
#include "wx/setup.h"
-// If using Metrowerks and not using configure-generated setup
+/* If using Metrowerks and not using configure-generated setup */
#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
# include <machine/ansi.h>
# endif
-// automatically includes MacHeaders
+/* automatically includes MacHeaders */
#elif (__MWERKS__ >= 0x0900) && __INTEL__
#define __WXMSW__
#endif