From a1dbda51ad1a3cdb98c4e4af9960deea46af8e58 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 30 Jan 2011 14:52:42 +0000
Subject: [PATCH] 2011-01-30 15:51 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbwin/hbolesrv.c     ! Fixed doubly defined symbols in
 HB_BUILD_CONTRIB_DYN=yes.       'hbmaindllp.lib(dllpcode.obj) : error
 LNK2005: _DllMain@12 already defined in hbolesrv.obj'       OLE server code
 will be left out of the .dll version of hbwin lib,       please refine it if
 needed.

---
 harbour/ChangeLog                | 7 +++++++
 harbour/contrib/hbwin/hbolesrv.c | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 98481455dc..1b238532e9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-30 15:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/hbolesrv.c
+    ! Fixed doubly defined symbols in HB_BUILD_CONTRIB_DYN=yes.
+      'hbmaindllp.lib(dllpcode.obj) : error LNK2005: _DllMain@12 already defined in hbolesrv.obj'
+      OLE server code will be left out of the .dll version of hbwin lib,
+      please refine it if needed.
+
 2011-01-30 15:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/listbox.prg
     ! LISTBOX(): Fixed RTE (and 5.3 incompatibility) when
diff --git a/harbour/contrib/hbwin/hbolesrv.c b/harbour/contrib/hbwin/hbolesrv.c
index 1dcf6ea031..2b598531b0 100644
--- a/harbour/contrib/hbwin/hbolesrv.c
+++ b/harbour/contrib/hbwin/hbolesrv.c
@@ -50,6 +50,8 @@
  *
  */
 
+#if ! defined( HB_DYNLIB )
+
 #include "hbapi.h"
 
 #include "hbwinole.h"
@@ -914,3 +916,5 @@ HB_FUNC( WIN_OLESERVERINIT )
    else
       hb_retl( s_fServerReady );
 }
+
+#endif