HP-UX fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/time.cpp

@@ -34,12 +34,13 @@ seconds since January 1, 1901, GMT.
 #include "wx/utils.h"
 #include "wx/intl.h"
 
-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
-    #include <iomanip.h>
-#else
-    #include <iomanip>
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <iomanip.h>
+    #else
+        #include <iomanip>
+    #endif
 #endif
 
 #include <string.h>

src/common/variant.cpp

@@ -20,10 +20,12 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
-#   include <fstream.h>
-#else
-#   include <fstream>
+#if wxUSE_STD_IOSTREAM
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
 #endif
 
 #if wxUSE_STREAMS

src/generic/dcpsg.cpp

@@ -476,7 +476,7 @@ void wxPostScriptDC::DoDrawArc (long x1, long y1, long x2, long y2, long xc, lon
 
     long dx = x1 - xc;
     long dy = y1 - yc;
-    long radius = (long) sqrt(dx*dx+dy*dy);
+    long radius = (long) sqrt( (double)(dx*dx+dy*dy) );
     double alpha1, alpha2;
 
     if (x1 == x2 && y1 == y2)

src/iodbc/config.h

@@ -35,7 +35,7 @@
 /* we have these definitions from configure */
 #if defined(HAVE_DLOPEN)
     #define DLDAPI_SVR4_DLFCN
-#elif define(HAVE_SHL_LOAD)
+#elif defined(HAVE_SHL_LOAD)
     #define DLDAPI_HP_SHL
 #endif