Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / dialup.cpp

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index cbf2e82cb9e4f15d2e66a6abb14cf1b137537cb5..c23defa8395674cf35c99f0ebab828fbecdc7567 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -38,24 +38,24 @@
     #include "wx/event.h"
 #endif
 
     #include "wx/event.h"
 #endif
 

-#ifndef wxUSE_DYNLIB_CLASS
-#error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
+#include "wx/msw/private.h"  // must be before #include "dynlib.h"
+
+#if !wxUSE_DYNLIB_CLASS
+    #error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.

 #endif
 
 #include "wx/dynlib.h"
 
 #include "wx/dialup.h"
 
 #endif
 
 #include "wx/dynlib.h"
 
 #include "wx/dialup.h"
 

-// Doesn't yet compile under BC++ nor with mingw: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__)
+// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)

 
 #include <ras.h>
 #include <raserror.h>
 
 #include <wininet.h>
 
 
 #include <ras.h>
 #include <raserror.h>
 
 #include <wininet.h>
 

-#include "wx/msw/private.h"
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------