From 2040b02fea26387832c5fe931f4feb979dac6af9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 7 May 2011 09:25:34 +0000
Subject: [PATCH] 2011-05-07 11:25 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * src/vm/maindllp/dllpcode.c     * readded more win specific
 macros (msvc didn't like it)

---
 harbour/ChangeLog                  | 16 ++++++++++------
 harbour/src/vm/maindllp/dllpcode.c | 26 +++++++++++++-------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4acc4e41d4..19ee7e7a6c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-07 11:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/vm/maindllp/dllpcode.c
+    * readded more win specific macros (msvc didn't like it)
+
 2011-05-06 11:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbxbp/xbp.ch
   * contrib/hbxbp/xbpdialog.prg
@@ -34,13 +38,13 @@
     ! Minor.
   * contrib/hbxbp/xbpwindow.prg
     ! Fixed: rather commented out the code where :handleEvent()
-      was destroying the object. I will look into another way 
-      how this can be achieved where :close callback is not 
-      defined to destroy the object and only xbeP_Close is 
-      sent via PostAppEvent(). Like: 
+      was destroying the object. I will look into another way
+      how this can be achieved where :close callback is not
+      defined to destroy the object and only xbeP_Close is
+      sent via PostAppEvent(). Like:
          oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ) }
       instead of
-         oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ), obj:destroy() } 
+         oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ), obj:destroy() }
 
 2011-05-06 16:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
@@ -97,7 +101,7 @@
   * src/rtl/libnamec.c
     + added HB_LIBPOSTFIX(). not finalized. it returns
       the dynamic lib postfix used by Harbour convention
-      (f.e. '-21', or '-21-wce-arm') by harbour core dll
+      (f.e. '-21', or '-21-wce-arm') by Harbour core dll
       and contrib dlls
 
   * src/vm/maindllp/dllpcode.c
diff --git a/harbour/src/vm/maindllp/dllpcode.c b/harbour/src/vm/maindllp/dllpcode.c
index 7d43f9efe7..8921ac0e20 100644
--- a/harbour/src/vm/maindllp/dllpcode.c
+++ b/harbour/src/vm/maindllp/dllpcode.c
@@ -63,28 +63,28 @@
    #endif
 #endif
 
-#define HB_DLL_PREF     "harbour"
-#define HB_DLL_VER      "-" HB_MACRO2STRING( HB_VER_MAJOR ) HB_MACRO2STRING( HB_VER_MINOR )
-#define HB_DLL_EXT      ".dll"
+#define HB_DLL_PREF     TEXT( "harbour" )
+#define HB_DLL_VER      TEXT( "-" ) TEXT( HB_MACRO2STRING( HB_VER_MAJOR ) ) TEXT( HB_MACRO2STRING( HB_VER_MINOR ) )
+#define HB_DLL_EXT      TEXT( ".dll" )
 
 #define HB_DLL_NAME     HB_DLL_PREF    HB_DLL_EXT
 
 #if   defined( HB_OS_WIN_CE ) && defined( HB_CPU_ARM )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-wce-arm" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-wce-arm" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_MIPS )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-wce-mips" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-wce-mips" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_SH )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-wce-sh" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-wce-sh" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_CE ) && defined( HB_CPU_X86 )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-wce-x86" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-wce-x86" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_CE )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-wce" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-wce" ) HB_DLL_EXT
 #elif defined( __BORLANDC__ )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-bcc" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-bcc" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_64 ) && defined( HB_CPU_X86_64 )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-x64" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-x64" ) HB_DLL_EXT
 #elif defined( HB_OS_WIN_64 ) && defined( HB_CPU_IA_64 )
-   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER "-ia64" HB_DLL_EXT
+   #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER TEXT( "-ia64" ) HB_DLL_EXT
 #else
    #define HB_DLL_NAME2   HB_DLL_PREF    HB_DLL_VER HB_DLL_EXT
 #endif
@@ -126,9 +126,9 @@ PHB_FUNC hb_dllGetProcAddress( const char * szProcName )
 
    if( s_hModule == NULL )
    {
-      s_hModule = GetModuleHandle( TEXT( HB_DLL_NAME ) );
+      s_hModule = GetModuleHandle( HB_DLL_NAME );
       if( s_hModule == NULL )
-         s_hModule = GetModuleHandle( TEXT( HB_DLL_NAME2 ) );
+         s_hModule = GetModuleHandle( HB_DLL_NAME2 );
       if( s_hModule == NULL )
          s_hModule = GetModuleHandle( NULL );