From 06e8ad1f320f56baccece8ee5bdc23fca9936c52 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 25 May 2010 23:55:13 +0000
Subject: [PATCH] 2010-05-26 01:54 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbwin/hbolesrv.def   * contrib/hbwin/hbolesrv-mgw.def 
  * contrib/hbwin/hbolesrv-ow.def     ! Added PRIVATE to DllRegisterServer and
 DllUnregisterServer.       (to pacify msvc warning)

  * contrib/hbwin/hbolesrv.hbc
  - contrib/hbwin/hbolesrv-mgw.def
  + contrib/hbwin/hbolesrv-mingw.def
  - contrib/hbwin/hbolesrv-ow.def
  + contrib/hbwin/hbolesrv-watcom.def
    * Renamed to use well-known compiler IDs.
---
 harbour/ChangeLog                                  | 14 ++++++++++++++
 .../hbwin/{hbolesrv-mgw.def => hbolesrv-mingw.def} |  4 ++--
 .../hbwin/{hbolesrv-ow.def => hbolesrv-watcom.def} |  4 ++--
 harbour/contrib/hbwin/hbolesrv.def                 |  4 ++--
 harbour/contrib/hbwin/hbolesrv.hbc                 |  4 ++--
 5 files changed, 22 insertions(+), 8 deletions(-)
 rename harbour/contrib/hbwin/{hbolesrv-mgw.def => hbolesrv-mingw.def} (63%)
 rename harbour/contrib/hbwin/{hbolesrv-ow.def => hbolesrv-watcom.def} (63%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bdb3ed864b..61361e8c3d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-26 01:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/hbolesrv.def
+  * contrib/hbwin/hbolesrv-mgw.def
+  * contrib/hbwin/hbolesrv-ow.def
+    ! Added PRIVATE to DllRegisterServer and DllUnregisterServer.
+      (to pacify msvc warning)
+
+  * contrib/hbwin/hbolesrv.hbc
+  - contrib/hbwin/hbolesrv-mgw.def
+  + contrib/hbwin/hbolesrv-mingw.def
+  - contrib/hbwin/hbolesrv-ow.def
+  + contrib/hbwin/hbolesrv-watcom.def
+    * Renamed to use well-known compiler IDs.
+
 2010-05-26 01:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbapi.h
     ! Added HB_EXPORT to hb_memvarGet() and hb_memvarSetValue()
diff --git a/harbour/contrib/hbwin/hbolesrv-mgw.def b/harbour/contrib/hbwin/hbolesrv-mingw.def
similarity index 63%
rename from harbour/contrib/hbwin/hbolesrv-mgw.def
rename to harbour/contrib/hbwin/hbolesrv-mingw.def
index ad18b01816..0d137bb9e4 100644
--- a/harbour/contrib/hbwin/hbolesrv-mgw.def
+++ b/harbour/contrib/hbwin/hbolesrv-mingw.def
@@ -5,6 +5,6 @@
 EXPORTS
 DllGetClassObject    = DllGetClassObject@12     PRIVATE
 DllCanUnloadNow      = DllCanUnloadNow@0        PRIVATE
-DllRegisterServer    = DllRegisterServer@0
-DllUnregisterServer  = DllUnregisterServer@0
+DllRegisterServer    = DllRegisterServer@0      PRIVATE
+DllUnregisterServer  = DllUnregisterServer@0    PRIVATE
 DllMain              = DllMain@12
diff --git a/harbour/contrib/hbwin/hbolesrv-ow.def b/harbour/contrib/hbwin/hbolesrv-watcom.def
similarity index 63%
rename from harbour/contrib/hbwin/hbolesrv-ow.def
rename to harbour/contrib/hbwin/hbolesrv-watcom.def
index 0fa096608a..e7788c02f6 100644
--- a/harbour/contrib/hbwin/hbolesrv-ow.def
+++ b/harbour/contrib/hbwin/hbolesrv-watcom.def
@@ -4,6 +4,6 @@
 
 EXPORT DllGetClassObject   = '_DllGetClassObject@12'  PRIVATE
 EXPORT DllCanUnloadNow     = '_DllCanUnloadNow@0'     PRIVATE
-EXPORT DllRegisterServer   = '_DllRegisterServer@0'
-EXPORT DllUnregisterServer = '_DllUnregisterServer@0'
+EXPORT DllRegisterServer   = '_DllRegisterServer@0'   PRIVATE
+EXPORT DllUnregisterServer = '_DllUnregisterServer@0' PRIVATE
 EXPORT DllMain             = '_DllMain@12'
diff --git a/harbour/contrib/hbwin/hbolesrv.def b/harbour/contrib/hbwin/hbolesrv.def
index 69ecd44637..0113b0acfe 100644
--- a/harbour/contrib/hbwin/hbolesrv.def
+++ b/harbour/contrib/hbwin/hbolesrv.def
@@ -5,6 +5,6 @@
 EXPORTS
 DllGetClassObject       PRIVATE
 DllCanUnloadNow         PRIVATE
-DllRegisterServer
-DllUnregisterServer
+DllRegisterServer       PRIVATE
+DllUnregisterServer     PRIVATE
 DllMain
diff --git a/harbour/contrib/hbwin/hbolesrv.hbc b/harbour/contrib/hbwin/hbolesrv.hbc
index 989d0babdc..268e3fc1c6 100644
--- a/harbour/contrib/hbwin/hbolesrv.hbc
+++ b/harbour/contrib/hbwin/hbolesrv.hbc
@@ -6,6 +6,6 @@ gt=gtgui
 
 cflags={watcom}-6r
 
-sources={mingw}hbolesrv-mgw.def
-sources={watcom}hbolesrv-ow.def
+sources={mingw}hbolesrv-mingw.def
+sources={watcom}hbolesrv-watcom.def
 sources={!mingw&!watcom}hbolesrv.def