From 029ef4ff41b99c31e1b2599818fcd10116ca29a6 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 26 Nov 2007 16:17:26 +0000
Subject: [PATCH] 2007-11-26 17:17 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/postinst.sh     * workaround for
 missing 'install' command in some HP-UX versions

  * harbour/contrib/xhb/cstructc.c
    * casting for 64bit builds
---
 harbour/ChangeLog              | 7 +++++++
 harbour/bin/postinst.sh        | 4 +++-
 harbour/contrib/xhb/cstructc.c | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d4197937c3..fd82d996d2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-26 17:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/postinst.sh
+    * workaround for missing 'install' command in some HP-UX versions
+
+  * harbour/contrib/xhb/cstructc.c
+    * casting for 64bit builds
+
 2007-11-26 08:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtwvg/wvtcore.c
     ! Fixed side effects of copy/paste in hb_wvt_gtDlgProcModal().
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index 1dd7e98a3b..16df867c97 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -58,7 +58,9 @@ then
             -e "s/^# CCPREFIX=\"\"\$/[ -n \"\${CCPREFIX}\" ] || CCPREFIX=\"${CCPREFIX}\"/g" \
             "${hb_root}/bin/hb-mkslib.sh" > "${hb_mkslib}" && \
         chmod 755 "${hb_mkslib}"
-    elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then
+    elif [ "${HB_ARCHITECTURE}" = "sunos" ] || \
+         [ "${HB_ARCHITECTURE}" = "hpux" ] || \
+         ! which install &>/dev/null; then
         rm -f "${HB_BIN_INSTALL}/hb-mkslib"
         cp "${hb_root}/bin/hb-mkslib.sh" "${HB_BIN_INSTALL}/hb-mkslib" && \
         chmod 755 "${HB_BIN_INSTALL}/hb-mkslib"
diff --git a/harbour/contrib/xhb/cstructc.c b/harbour/contrib/xhb/cstructc.c
index 063cd9b977..ea4ae6eeef 100644
--- a/harbour/contrib/xhb/cstructc.c
+++ b/harbour/contrib/xhb/cstructc.c
@@ -1415,11 +1415,11 @@ HB_FUNC( HB_POINTER2STRING )
    }
    else if( HB_IS_INTEGER( pPointer ) && pLen )
    {
-      hb_retclen( (char *) hb_itemGetNI( pPointer ), (ULONG) hb_itemGetNL( pLen ) );
+      hb_retclen( (char *) (HB_PTRDIFF) hb_itemGetNI( pPointer ), (ULONG) hb_itemGetNL( pLen ) );
    }
    else if( HB_IS_LONG( pPointer ) && pLen )
    {
-      hb_retclen( (char *) hb_itemGetNL( pPointer ), (ULONG) hb_itemGetNL( pLen ) );
+      hb_retclen( (char *) (HB_PTRDIFF) hb_itemGetNL( pPointer ), (ULONG) hb_itemGetNL( pLen ) );
    }
    else
       hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_Pointer2String", 2, hb_paramError( 1 ), hb_paramError( 2 ) );