From be0872076f185e94b1a76c116ac4874af443c526 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Thu, 14 Oct 1999 17:08:31 +0000
Subject: [PATCH]   HP-UX fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure.in           | 14 +++++++++-----
 src/common/time.cpp    | 13 +++++++------
 src/common/variant.cpp | 10 ++++++----
 src/generic/dcpsg.cpp  |  2 +-
 src/iodbc/config.h     |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/configure.in b/configure.in
index c2193d6fee..014e565706 100644
--- 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 49458ca524..1e358e4a09 100644
--- 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 4bcefec312..3acdd76f4f 100644
--- 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 3f039b97ac..a02303a670 100644
--- 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 3f2bff3786..c42ea64e59 100644
--- 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
 
-- 
2.45.2