2010-10-08 17:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/utils/hbmk2/hbmk2.prg
    ! disabled automatic generation of dll_hb_vmProcAddress()
      in binaries linked with hbmaindllp library.
      Such function should be attached to the code linked with
      HVM on user request i.e. using some new HBMK2 switch.

  * harbour/contrib/xhb/xhw32prn.prg
    * added dummy WIN32BMP() function in non MS-Windows builds

  * harbour/contrib/rddads/adsfunc.c
    * added dummy ADSREGCALLBACK() and ADSCLRCALLBACK() functions
      to Linux builds

  * harbour/contrib/hbxpp/hbxpp.hbx
  * harbour/contrib/hbqt/qtgui/hbqtgui.hbx
  * harbour/contrib/hbqt/qtcore/hbqtcore.hbx
    * automatically updated by HB_REBUILD_EXTERN=yes

harbour/ChangeLog

@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-10-08 17:59 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/hbmk2.prg
+    ! disabled automatic generation of dll_hb_vmProcAddress()
+      in binaries linked with hbmaindllp library.
+      Such function should be attached to the code linked with
+      HVM on user request i.e. using some new HBMK2 switch.
+
+  * harbour/contrib/xhb/xhw32prn.prg
+    * added dummy WIN32BMP() function in non MS-Windows builds
+
+  * harbour/contrib/rddads/adsfunc.c
+    * added dummy ADSREGCALLBACK() and ADSCLRCALLBACK() functions
+      to Linux builds
+
+  * harbour/contrib/hbxpp/hbxpp.hbx
+  * harbour/contrib/hbqt/qtgui/hbqtgui.hbx
+  * harbour/contrib/hbqt/qtcore/hbqtcore.hbx
+    * automatically updated by HB_REBUILD_EXTERN=yes
+
 2010-10-08 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbcom.c
     * explicitly set HB_COM_ERR_TIMEOUT and return -1 in all OS-es if

harbour/contrib/hbqt/qtcore/hbqtcore.hbx

@@ -33,6 +33,7 @@ DYNAMIC HBQSLOTS
 DYNAMIC HBQSTRING
 DYNAMIC HBQTOBJECTHANDLER
 DYNAMIC HBQT_ERROR
+DYNAMIC HBQT_FINDCHILD
 DYNAMIC HBQT_ISEQUALGCQTPOINTER
 DYNAMIC HBQT_PTR
 DYNAMIC HB_HBQEVENTS

harbour/contrib/hbqt/qtgui/hbqtgui.hbx

@@ -77,6 +77,7 @@ DYNAMIC HB_QCONTEXTMENUEVENT
 DYNAMIC HB_QCURSOR
 DYNAMIC HB_QDATEEDIT
 DYNAMIC HB_QDATETIMEEDIT
+DYNAMIC HB_QDESKTOPSERVICES
 DYNAMIC HB_QDESKTOPWIDGET
 DYNAMIC HB_QDIAL
 DYNAMIC HB_QDIALOG
@@ -207,6 +208,7 @@ DYNAMIC HB_QSHOWEVENT
 DYNAMIC HB_QSIZEGRIP
 DYNAMIC HB_QSIZEPOLICY
 DYNAMIC HB_QSLIDER
+DYNAMIC HB_QSORTFILTERPROXYMODEL
 DYNAMIC HB_QSOUND
 DYNAMIC HB_QSPACERITEM
 DYNAMIC HB_QSPINBOX
@@ -332,6 +334,7 @@ DYNAMIC QCONTEXTMENUEVENT
 DYNAMIC QCURSOR
 DYNAMIC QDATEEDIT
 DYNAMIC QDATETIMEEDIT
+DYNAMIC QDESKTOPSERVICES
 DYNAMIC QDESKTOPWIDGET
 DYNAMIC QDIAL
 DYNAMIC QDIALOG
@@ -462,6 +465,7 @@ DYNAMIC QSHOWEVENT
 DYNAMIC QSIZEGRIP
 DYNAMIC QSIZEPOLICY
 DYNAMIC QSLIDER
+DYNAMIC QSORTFILTERPROXYMODEL
 DYNAMIC QSOUND
 DYNAMIC QSPACERITEM
 DYNAMIC QSPINBOX

harbour/contrib/hbxpp/hbxpp.hbx

@@ -62,6 +62,7 @@ DYNAMIC THREADWAITALL
 DYNAMIC U2BIN
 DYNAMIC W2BIN
 DYNAMIC WORKSPACELIST
+DYNAMIC XPP_DBUSEAREA
 DYNAMIC XPP_GET
 DYNAMIC XPP_INCLUDE
 DYNAMIC XPP_INDEX

harbour/contrib/rddads/adsfunc.c

@@ -67,7 +67,7 @@
 
 #if !defined( ADS_LINUX )
 static PHB_ITEM s_pItmCobCallBack = NULL;
-#endif
+#endif /* !ADS_LINUX */
 
 int       hb_ads_iFileType = ADS_CDX;
 int       hb_ads_iLockType = ADS_PROPRIETARY_LOCKING;
@@ -1373,7 +1373,6 @@ HB_FUNC( ADSCONVERTTABLE )
 }
 
 #if !defined( ADS_LINUX )
-
 UNSIGNED32 WINAPI hb_adsShowPercentageCB( UNSIGNED16 usPercentDone )
 {
    if( s_pItmCobCallBack && HB_IS_BLOCK( s_pItmCobCallBack ) )
@@ -1394,9 +1393,11 @@ UNSIGNED32 WINAPI hb_adsShowPercentageCB( UNSIGNED16 usPercentDone )
 
    return 0;
 }
+#endif /* !ADS_LINUX */
 
 HB_FUNC( ADSREGCALLBACK )
 {
+#if !defined( ADS_LINUX )
    /* NOTE: current implementation is not thread safe.
             ADS can register multiple callbacks, but one per thread/connection.
             To be thread safe, we need multiple connections.
@@ -1421,12 +1422,14 @@ HB_FUNC( ADSREGCALLBACK )
          s_pItmCobCallBack = NULL;
       }
    }
+#endif /* !ADS_LINUX */
 
    hb_retl( HB_FALSE );
 }
 
 HB_FUNC( ADSCLRCALLBACK )
 {
+#if !defined( ADS_LINUX )
    if( s_pItmCobCallBack )
    {
       hb_itemRelease( s_pItmCobCallBack );
@@ -1434,10 +1437,11 @@ HB_FUNC( ADSCLRCALLBACK )
    }
 
    hb_retnl( AdsClearProgressCallback() );
+#else
+   hb_retnl( 0 );
+#endif /* ADS_LINUX */
 }
 
-#endif
-
 HB_FUNC( ADSISINDEXED )
 {
    ADSAREAP pArea = hb_adsGetWorkAreaPointer();

harbour/contrib/xhb/xhw32prn.prg

@@ -58,6 +58,9 @@
 FUNCTION WIN32PRN()
 RETURN NIL
 
+FUNCTION WIN32BMP()
+RETURN NIL
+
 #else
 
 #include "hbclass.ch"

harbour/utils/hbmk2/hbmk2.prg

@@ -4916,7 +4916,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                   cFile += ''                                                                     + Chr( 10 )
                ENDIF
 
-               IF lHBMAINDLLP
+               IF lHBMAINDLLP .and. .F.
                   cFile += 'HB_EXPORT_ATTR PHB_FUNC dll_hb_vmProcAddress( const char * szFuncName )' + Chr( 10 )
                   cFile += '{'                                                                       + Chr( 10 )
                   cFile += '   return hb_vmProcAddress( szFuncName );'                               + Chr( 10 )