HP-UX fixes

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

diff --git a/configure.in b/configure.in
index c2193d6fee428cb2bc1e5c3767d8a7ae926add3f..014e5657060ed716118ccc05b8a55c62034313a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1735,14 +1735,16 @@ WX_ALL=
 WX_ALL_INSTALLED=
 
 if test "$wxUSE_SHARED" = "yes"; then
-    dnl set target to shared
-    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
-
     case "${host}" in
       *-hp-hpux* )
+        if test "$GCC" = yes ; then
+            SHARED_LD="${CC} -shared -o"
+            PIC_FLAG="-fPIC"
+        else
+            SHARED_LD="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
         WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
-        SHARED_LD="${CXX} -b -o"
-        PIC_FLAG="+Z"
         WX_ALL=${WX_LIBRARY_NAME_SHARED}
       ;;
       *-*-linux* )
@@ -1822,6 +1824,8 @@ if test "$wxUSE_SHARED" = "yes"; then
         AC_MSG_ERROR(unknown system type ${host}.)
     esac
 
+    dnl set target to shared
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
 else
     dnl set target to static
     WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 49458ca52436da5765443f80a72fd3263acb2fcb..1e358e4a09c2c1cee39b4e75db838071e4014b3e 100644 (file)
--- a/src/common/time.cpp
+++ b/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>

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 4bcefec312a99acabecb44d35935cfc7c006327b..3acdd76f4f0a844d043be7facc1df7d9ab6e4c3f 100644 (file)
--- a/src/common/variant.cpp
+++ b/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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 3f039b97ac7dee841e268a7008b71730dd143f99..a02303a67076a76bd164c3ad0b45ce076764f152 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/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)

diff --git a/src/iodbc/config.h b/src/iodbc/config.h
index 3f2bff3786e07a4d8e5463a1bff14295e4902d8a..c42ea64e59c26512ace2e6682c2bfb0aac594f27 100644 (file)
--- a/src/iodbc/config.h
+++ b/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