2011-02-05 09:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* utils/hbmk2/hbmk2.prg * config/hbextern.hbs + Now generates code which makes it possible to use __HBEXTREQ__ macro to compile .hbx as extern puller module. So no extra .prg is needed for that. * contrib/hbpost.hbm + Define __HBEXTREQ__ * contrib/hbunix/hbunix.hbp + contrib/hbunix/hbunix.hbx + Added extern puller (now without extra .prg) * contrib/hbrunext/pullext.prg * contrib/hbrunext/hbrunext.hbp + Added hbunix for *nix builds. * contrib/hbct/hbct.hbx * contrib/hbmxml/hbmxml.hbx * contrib/hbxbp/hbxbp.hbx * contrib/hblzf/hblzf.hbx * contrib/hbxdiff/hbxdiff.hbx * contrib/hbwin/hbwin.hbx * contrib/xhb/xhb.hbx * contrib/hbexpat/hbexpat.hbx * contrib/hbqt/qtgui/hbqtgui.hbx * contrib/hbqt/qtwebkit/hbqtwebkit.hbx * contrib/hbqt/qtcore/hbqtcore.hbx * contrib/hbqt/qtnetwork/hbqtnetwork.hbx * contrib/hbqt/qtuitools/hbqtuitools.hbx * contrib/hbqt/qtdesigner/hbqtdesigner.hbx * contrib/hbxpp/hbxpp.hbx * contrib/rddads/rddads.hbx * contrib/hbgd/hbgd.hbx * Regenerated. ; TODO: Optimize out extern puller .prgs.
2011-02-05 08:22:50 +00:00
parent e03f938fbd
commit 3e640f36a4
25 changed files with 148 additions and 57 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,45 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-02-05 09:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/hbextern.hbs
+    + Now generates code which makes it possible to use __HBEXTREQ__
+      macro to compile .hbx as extern puller module. So no extra
+      .prg is needed for that.
+
+  * contrib/hbpost.hbm
+    + Define __HBEXTREQ__
+
+  * contrib/hbunix/hbunix.hbp
+  + contrib/hbunix/hbunix.hbx
+    + Added extern puller (now without extra .prg)
+
+  * contrib/hbrunext/pullext.prg
+  * contrib/hbrunext/hbrunext.hbp
+    + Added hbunix for *nix builds.
+
+  * contrib/hbct/hbct.hbx
+  * contrib/hbmxml/hbmxml.hbx
+  * contrib/hbxbp/hbxbp.hbx
+  * contrib/hblzf/hblzf.hbx
+  * contrib/hbxdiff/hbxdiff.hbx
+  * contrib/hbwin/hbwin.hbx
+  * contrib/xhb/xhb.hbx
+  * contrib/hbexpat/hbexpat.hbx
+  * contrib/hbqt/qtgui/hbqtgui.hbx
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbx
+  * contrib/hbqt/qtcore/hbqtcore.hbx
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbx
+  * contrib/hbqt/qtuitools/hbqtuitools.hbx
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbx
+  * contrib/hbxpp/hbxpp.hbx
+  * contrib/rddads/rddads.hbx
+  * contrib/hbgd/hbgd.hbx
+    * Regenerated.
+
+  ; TODO: Optimize out extern puller .prgs.
+
 2011-02-04 18:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbrunext/pullext.prg
    + copyright header.
--- a/harbour/config/hbextern.hbs
+++ b/harbour/config/hbextern.hbs
@@ -174,11 +174,11 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
   cExtern += "#ifndef " + "__HBEXTERN_CH__" + Upper( __FNameNameGet( cOutputName ) ) + "__" + hb_eol()
   cExtern += "#define " + "__HBEXTERN_CH__" + Upper( __FNameNameGet( cOutputName ) ) + "__" + hb_eol()
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "ANNOUNCE" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol()
   cExtern += "   ANNOUNCE " + cSelfName + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "REQUEST" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
   cExtern += "   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()
@@ -200,7 +200,7 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
      ENDIF
   NEXT
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "REQUEST" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
   cExtern += "   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()
--- a/harbour/contrib/hbct/hbct.hbx
+++ b/harbour/contrib/hbct/hbct.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBCT__
 #define __HBEXTERN_CH__HBCT__

-#ifdef __HBEXTERN__HBCT__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCT__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBCT__
 #endif

-#ifdef __HBEXTERN__HBCT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCT__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -403,7 +403,7 @@ DYNAMIC ZEROINSERT
 DYNAMIC ZEROREMOVE
 DYNAMIC _HB_CTDSPTIME

-#ifdef __HBEXTERN__HBCT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBCT__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbexpat/hbexpat.hbx
+++ b/harbour/contrib/hbexpat/hbexpat.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBEXPAT__
 #define __HBEXTERN_CH__HBEXPAT__

-#ifdef __HBEXTERN__HBEXPAT__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBEXPAT__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBEXPAT__
 #endif

-#ifdef __HBEXTERN__HBEXPAT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBEXPAT__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -79,7 +79,7 @@ DYNAMIC XML_STOPPARSER
 DYNAMIC XML_USEFOREIGNDTD
 DYNAMIC __HB_XML_CDPU16MAP

-#ifdef __HBEXTERN__HBEXPAT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBEXPAT__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbgd/hbgd.hbx
+++ b/harbour/contrib/hbgd/hbgd.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBGD__
 #define __HBEXTERN_CH__HBGD__

-#ifdef __HBEXTERN__HBGD__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGD__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBGD__
 #endif

-#ifdef __HBEXTERN__HBGD__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGD__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -140,7 +140,7 @@ DYNAMIC HB_GD_VERSION
 DYNAMIC TBARCODE
 DYNAMIC TCODE

-#ifdef __HBEXTERN__HBGD__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBGD__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hblzf/hblzf.hbx
+++ b/harbour/contrib/hblzf/hblzf.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBLZF__
 #define __HBEXTERN_CH__HBLZF__

-#ifdef __HBEXTERN__HBLZF__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBLZF__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBLZF__
 #endif

-#ifdef __HBEXTERN__HBLZF__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBLZF__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -32,7 +32,7 @@ DYNAMIC HB_LZF_DECOMPRESS
 DYNAMIC HB_LZF_OPTIMIZED_FOR_SPEED
 DYNAMIC HB_LZF_VERSION

-#ifdef __HBEXTERN__HBLZF__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBLZF__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbmxml/hbmxml.hbx
+++ b/harbour/contrib/hbmxml/hbmxml.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBMXML__
 #define __HBEXTERN_CH__HBMXML__

-#ifdef __HBEXTERN__HBMXML__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMXML__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBMXML__
 #endif

-#ifdef __HBEXTERN__HBMXML__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMXML__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -93,7 +93,7 @@ DYNAMIC MXMLSETWRAPMARGIN
 DYNAMIC MXMLWALKNEXT
 DYNAMIC MXMLWALKPREV

-#ifdef __HBEXTERN__HBMXML__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBMXML__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -11,6 +11,7 @@
 -prgflag=-es2
 -prgflag=-kmo
 -prgflag=-i-
+-prgflag=-D__HBEXTREQ__

 # It is also supported by official mingw 4.4.x and mingw64 4.4.x,
 # but not supported by mingw tdm 4.4.x, so I only enable it on or
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTCORE__
 #define __HBEXTERN_CH__HBQTCORE__

-#ifdef __HBEXTERN__HBQTCORE__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTCORE__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTCORE__
 #endif

-#ifdef __HBEXTERN__HBQTCORE__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTCORE__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -232,7 +232,7 @@ DYNAMIC __HBQT_SLOTS_CONNECT
 DYNAMIC __HBQT_SLOTS_DISCONNECT
 DYNAMIC __HBQT_SLOTS_NEW

-#ifdef __HBEXTERN__HBQTCORE__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTCORE__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTDESIGNER__
 #define __HBEXTERN_CH__HBQTDESIGNER__

-#ifdef __HBEXTERN__HBQTDESIGNER__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTDESIGNER__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTDESIGNER__
 #endif

-#ifdef __HBEXTERN__HBQTDESIGNER__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTDESIGNER__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -54,7 +54,7 @@ DYNAMIC QDESIGNERWIDGETBOXINTERFACE
 DYNAMIC QDESIGNERWIDGETBOXINTERFACEFROMPOINTER
 DYNAMIC __HBQTDESIGNER

-#ifdef __HBEXTERN__HBQTDESIGNER__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTDESIGNER__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTGUI__
 #define __HBEXTERN_CH__HBQTGUI__

-#ifdef __HBEXTERN__HBQTGUI__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTGUI__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTGUI__
 #endif

-#ifdef __HBEXTERN__HBQTGUI__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTGUI__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -818,7 +818,7 @@ DYNAMIC QWIZARDPAGEFROMPOINTER
 DYNAMIC Q__TR
 DYNAMIC __HBQTGUI

-#ifdef __HBEXTERN__HBQTGUI__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTGUI__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTNETWORK__
 #define __HBEXTERN_CH__HBQTNETWORK__

-#ifdef __HBEXTERN__HBQTNETWORK__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTNETWORK__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTNETWORK__
 #endif

-#ifdef __HBEXTERN__HBQTNETWORK__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTNETWORK__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -48,7 +48,7 @@ DYNAMIC QNETWORKREQUEST
 DYNAMIC QNETWORKREQUESTFROMPOINTER
 DYNAMIC __HBQTNETWORK

-#ifdef __HBEXTERN__HBQTNETWORK__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTNETWORK__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx
+++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTUITOOLS__
 #define __HBEXTERN_CH__HBQTUITOOLS__

-#ifdef __HBEXTERN__HBQTUITOOLS__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTUITOOLS__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTUITOOLS__
 #endif

-#ifdef __HBEXTERN__HBQTUITOOLS__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTUITOOLS__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -34,7 +34,7 @@ DYNAMIC QUILOADER
 DYNAMIC QUILOADERFROMPOINTER
 DYNAMIC __HBQTUITOOLS

-#ifdef __HBEXTERN__HBQTUITOOLS__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTUITOOLS__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBQTWEBKIT__
 #define __HBEXTERN_CH__HBQTWEBKIT__

-#ifdef __HBEXTERN__HBQTWEBKIT__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTWEBKIT__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBQTWEBKIT__
 #endif

-#ifdef __HBEXTERN__HBQTWEBKIT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTWEBKIT__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -60,7 +60,7 @@ DYNAMIC QWEBVIEW
 DYNAMIC QWEBVIEWFROMPOINTER
 DYNAMIC __HBQTWEBKIT

-#ifdef __HBEXTERN__HBQTWEBKIT__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBQTWEBKIT__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbrunext/hbrunext.hbp
+++ b/harbour/contrib/hbrunext/hbrunext.hbp
@@ -22,4 +22,5 @@ pullext.prg

 hbct.hbc
 hbexpat.hbc
+hbunix.hbc{unix}
 hbwin.hbc{allwin}
--- a/harbour/contrib/hbrunext/pullext.prg
+++ b/harbour/contrib/hbrunext/pullext.prg
@@ -54,6 +54,9 @@ ANNOUNCE __PULLEXT

 REQUEST __HBEXTERN__HBCT__
 REQUEST __HBEXTERN__HBEXPAT__
+#if defined( __PLATFORM__UNIX )
+REQUEST __HBEXTERN__HBUNIX__
+#endif
 #if defined( __PLATFORM__WINDOWS )
 REQUEST __HBEXTERN__HBWIN__
 #endif
--- a/harbour/contrib/hbunix/hbunix.hbp
+++ b/harbour/contrib/hbunix/hbunix.hbp
@@ -11,6 +11,8 @@

 -stop{!unix}

+hbunix.hbx
+
 daemon.c
 posix.c
 posixerr.c
--- a/harbour/contrib/hbunix/hbunix.hbx
+++ b/harbour/contrib/hbunix/hbunix.hbx
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ */
+
+/* -------------------------------------------------------------------- */
+/* NOTE: Following comments are control commands for the generator.     */
+/*       Do not edit them unless you know what you are doing.           */
+/*          Syntax: // HB_FUNC_INCLUDE <func>                           */
+/*                  // HB_FUNC_EXCLUDE <func>                           */
+/* -------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------- */
+/* WARNING: Automatically generated code below. DO NOT EDIT!            */
+/*          Regenerate with HB_REBUILD_EXTERN=yes while using GCC       */
+/*          compiler family. [vszakats]                                 */
+/* -------------------------------------------------------------------- */
+
+#ifndef __HBEXTERN_CH__HBUNIX__
+#define __HBEXTERN_CH__HBUNIX__
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBUNIX__ANNOUNCE )
+   ANNOUNCE __HBEXTERN__HBUNIX__
+#endif
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBUNIX__REQUEST )
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC POSIX_GETPID
+DYNAMIC POSIX_ERRNO
+DYNAMIC POSIX_GETUID
+DYNAMIC POSIX_GETEUID
+DYNAMIC POSIX_GETGID
+DYNAMIC POSIX_GETEGID
+DYNAMIC POSIX_SETUID
+DYNAMIC POSIX_SETEUID
+DYNAMIC POSIX_SETGID
+DYNAMIC POSIX_SETEGID
+DYNAMIC UNIX_DAEMON
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBUNIX__REQUEST )
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif
--- a/harbour/contrib/hbwin/hbwin.hbx
+++ b/harbour/contrib/hbwin/hbwin.hbx
@@ -20,11 +20,11 @@
 #ifndef __HBEXTERN_CH__HBWIN__
 #define __HBEXTERN_CH__HBWIN__

-#ifdef __HBEXTERN__HBWIN__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBWIN__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBWIN__
 #endif

-#ifdef __HBEXTERN__HBWIN__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBWIN__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -426,7 +426,7 @@ DYNAMIC __WAPI_DEVMODE_GET
 DYNAMIC __WAPI_DEVMODE_NEW
 DYNAMIC __WAPI_DEVMODE_SET

-#ifdef __HBEXTERN__HBWIN__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBWIN__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbxbp/hbxbp.hbx
+++ b/harbour/contrib/hbxbp/hbxbp.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBXBP__
 #define __HBEXTERN_CH__HBXBP__

-#ifdef __HBEXTERN__HBXBP__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXBP__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBXBP__
 #endif

-#ifdef __HBEXTERN__HBXBP__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXBP__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -129,7 +129,7 @@ DYNAMIC XBP_SETPRESPARAM
 DYNAMIC XBP_SETPRESPARAMIFNIL
 DYNAMIC XBP_XBPTOQTNAME

-#ifdef __HBEXTERN__HBXBP__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXBP__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbxdiff/hbxdiff.hbx
+++ b/harbour/contrib/hbxdiff/hbxdiff.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBXDIFF__
 #define __HBEXTERN_CH__HBXDIFF__

-#ifdef __HBEXTERN__HBXDIFF__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXDIFF__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBXDIFF__
 #endif

-#ifdef __HBEXTERN__HBXDIFF__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXDIFF__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -41,7 +41,7 @@ DYNAMIC XDL_READ_MMFILE
 DYNAMIC XDL_SEEK_MMFILE
 DYNAMIC XDL_WRITE_MMFILE

-#ifdef __HBEXTERN__HBXDIFF__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXDIFF__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/hbxpp/hbxpp.hbx
+++ b/harbour/contrib/hbxpp/hbxpp.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__HBXPP__
 #define __HBEXTERN_CH__HBXPP__

-#ifdef __HBEXTERN__HBXPP__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXPP__ANNOUNCE )
   ANNOUNCE __HBEXTERN__HBXPP__
 #endif

-#ifdef __HBEXTERN__HBXPP__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXPP__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -75,7 +75,7 @@ DYNAMIC XPP_TBROWSEDB
 DYNAMIC _DBEXPORT
 DYNAMIC _TYPEFILE

-#ifdef __HBEXTERN__HBXPP__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXPP__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/rddads/rddads.hbx
+++ b/harbour/contrib/rddads/rddads.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__RDDADS__
 #define __HBEXTERN_CH__RDDADS__

-#ifdef __HBEXTERN__RDDADS__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADS__ANNOUNCE )
   ANNOUNCE __HBEXTERN__RDDADS__
 #endif

-#ifdef __HBEXTERN__RDDADS__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADS__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -170,7 +170,7 @@ DYNAMIC ADSWRITEALLRECORDS
 DYNAMIC ADSX
 DYNAMIC HB_RDDADSREGISTER

-#ifdef __HBEXTERN__RDDADS__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__RDDADS__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/contrib/xhb/xhb.hbx
+++ b/harbour/contrib/xhb/xhb.hbx
@@ -18,11 +18,11 @@
 #ifndef __HBEXTERN_CH__XHB__
 #define __HBEXTERN_CH__XHB__

-#ifdef __HBEXTERN__XHB__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__XHB__ANNOUNCE )
   ANNOUNCE __HBEXTERN__XHB__
 #endif

-#ifdef __HBEXTERN__XHB__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__XHB__REQUEST )
   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

@@ -456,7 +456,7 @@ DYNAMIC __MVSYMBOLINFO
 DYNAMIC __OUTDEBUG
 DYNAMIC __SENDRAWMSG

-#ifdef __HBEXTERN__XHB__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__XHB__REQUEST )
   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif

--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -11398,11 +11398,11 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
   cExtern += "#ifndef " + "__HBEXTERN_CH__" + Upper( FNameNameGet( cOutputName ) ) + "__" + hb_eol()
   cExtern += "#define " + "__HBEXTERN_CH__" + Upper( FNameNameGet( cOutputName ) ) + "__" + hb_eol()
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "ANNOUNCE" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "ANNOUNCE" + " )" + hb_eol()
   cExtern += "   ANNOUNCE " + cSelfName + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "REQUEST" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
   cExtern += "   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()
@@ -11424,7 +11424,7 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName )
      ENDIF
   NEXT
   cExtern += hb_eol()
-   cExtern += "#ifdef " + cSelfName + "REQUEST" + hb_eol()
+   cExtern += "#if defined( __HBEXTREQ__ ) .OR. defined( " + cSelfName + "REQUEST" + " )" + hb_eol()
   cExtern += "   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>" + hb_eol()
   cExtern += "#endif" + hb_eol()
   cExtern += hb_eol()