Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HP-UX fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-14 17:08:31 +00:00
parent 458ed37d80
commit be0872076f
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.in
View File

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

9
src/common/time.cpp
View File

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

10
src/common/variant.cpp
View File

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

2
src/generic/dcpsg.cpp
View File

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

2
src/iodbc/config.h
View File

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