From 568db04b6eb61c41af827ee162b69183077eeb49 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 17 Feb 2010 23:01:58 +0000
Subject: [PATCH] 2010-02-18 00:01 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/harbour.spec     ! fixed to work with
 modified library name hbbmcdx -> rddbmcdx

  * harbour/contrib/hbwin/legacycd.c
    ! fixed casting for C++ builds
---
 harbour/ChangeLog                | 7 +++++++
 harbour/contrib/hbwin/legacycd.c | 2 +-
 harbour/harbour.spec             | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ebaf68f93a..76ad011aea 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-18 00:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/harbour.spec
+    ! fixed to work with modified library name hbbmcdx -> rddbmcdx
+
+  * harbour/contrib/hbwin/legacycd.c
+    ! fixed casting for C++ builds
+
 2010-02-17 20:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbdefs.h
     * use '__int64' instead of 'long long' only in non GCC MS-Windows builds
diff --git a/harbour/contrib/hbwin/legacycd.c b/harbour/contrib/hbwin/legacycd.c
index 2d09276404..91fdd152ed 100644
--- a/harbour/contrib/hbwin/legacycd.c
+++ b/harbour/contrib/hbwin/legacycd.c
@@ -152,7 +152,7 @@ HB_FUNC( GETPROCADDRESS )
          hb_xfree( pszFuncName );
       }
 
-      hb_retptr( lpFunction );
+      hb_retptr( ( void * ) lpFunction );
    }
    else
       hb_retptr( NULL );
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 521af08a9c..b6168d5b75 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -69,7 +69,7 @@
 %define hb_ldir   export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_edir   export HB_ETC_INSTALL=%{hb_etcdir}
 %define hb_cmrc   export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes}
-%define hb_ctrb   export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql} %{?_with_odbc:hbodbc} %{?_with_pgsql:hbpgsql} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
+%define hb_ctrb   export HB_CONTRIBLIBS="hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddbmcdx rddsql hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql} %{?_with_odbc:hbodbc} %{?_with_pgsql:hbpgsql} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
 %define hb_env    %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host   www.harbour-project.org
 %define readme    README.RPM
@@ -630,7 +630,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libxhb.a
 %{_libdir}/%{name}/libhbhpdf.a
 %{_libdir}/%{name}/libhbgt.a
-%{_libdir}/%{name}/libhbbmcdx.a
+%{_libdir}/%{name}/librddbmcdx.a
 %{_libdir}/%{name}/libhbclipsm.a
 %{_libdir}/%{name}/librddsql.a
 %{_libdir}/%{name}/libhbsms.a