From 6ff29efe3674270a41df34b0df0ed64d5514270e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Jun 2010 22:10:26 +0000
Subject: [PATCH] 2010-06-23 00:07 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * harbour-win-spec   * harbour-wce-spec   * harbour.spec   *
 include/hbver.h   * config/global.mk     + Changed version number to:        
  2.1.0beta2 (from 2.1.0beta1)

  * src/compiler/hbopt.c
    * Formatting.
---
 harbour/ChangeLog            | 12 ++++++++++++
 harbour/config/global.mk     |  4 ++--
 harbour/harbour-wce-spec     |  2 +-
 harbour/harbour-win-spec     |  2 +-
 harbour/harbour.spec         |  2 +-
 harbour/include/hbver.h      |  2 +-
 harbour/src/compiler/hbopt.c |  2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 074f2c1d3f..a579b514f0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-23 00:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour-win-spec
+  * harbour-wce-spec
+  * harbour.spec
+  * include/hbver.h
+  * config/global.mk
+    + Changed version number to:
+         2.1.0beta2 (from 2.1.0beta1)
+
+  * src/compiler/hbopt.c
+    * Formatting.
+
 2010-06-22 14:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/THbQtUI.prg
     % Little more syncronization.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 1989e30882..5b8017ca72 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -36,9 +36,9 @@ HB_VER_MAJOR     := 2
 HB_VER_MINOR     := 1
 HB_VER_RELEASE   := 0
 # Status (dev, alpha1, alpha2, beta1, beta2, rc1, rc2, empty for final)
-HB_VER_STATUS    := beta1
+HB_VER_STATUS    := beta2
 # Short status (d, a1, a2, b1, b2, r1, r2, empty for final)
-HB_VER_STATUS_SH := b1
+HB_VER_STATUS_SH := b2
 
 ifeq ($(HB_VER_STATUS_SH),)
    HB_VER_STATUS_SH := $(HB_VER_MINOR)$(HB_VER_RELEASE)
diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec
index 075678fd0f..b98c377b2d 100644
--- a/harbour/harbour-wce-spec
+++ b/harbour/harbour-wce-spec
@@ -15,7 +15,7 @@
 
 %define name      harbour-wce
 %define version   2.1.0
-%define releasen  beta1
+%define releasen  beta2
 %define hb_pref   hbce
 %define hb_host   harbour-project.org
 %define readme    README.RPM
diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec
index 1285ecea5d..6e3cddd7bf 100644
--- a/harbour/harbour-win-spec
+++ b/harbour/harbour-win-spec
@@ -15,7 +15,7 @@
 
 %define name      harbour-win
 %define version   2.1.0
-%define releasen  beta1
+%define releasen  beta2
 %define hb_pref   hbw
 %define hb_host   harbour-project.org
 %define readme    README.RPM
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 4079d6ab84..d42ae38c7b 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -51,7 +51,7 @@
 %define name      harbour
 %define dname     Harbour
 %define version   2.1.0
-%define releasen  beta1
+%define releasen  beta2
 %define hb_etcdir /etc/%{name}
 %define hb_plat   export HB_PLATFORM=linux
 %define hb_cc     export HB_COMPILER=gcc
diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h
index 08c4796a33..a225f83f73 100644
--- a/harbour/include/hbver.h
+++ b/harbour/include/hbver.h
@@ -62,7 +62,7 @@
 #define HB_VER_MAJOR    2        /* Major version number */
 #define HB_VER_MINOR    1        /* Minor version number */
 #define HB_VER_RELEASE  0        /* Release number */
-#define HB_VER_STATUS   "beta1"  /* Build status (all lowercase) */
+#define HB_VER_STATUS   "beta2"  /* Build status (all lowercase) */
 #define __HARBOUR__     0x020100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */
 
 #endif /* HB_VER_H_ */
diff --git a/harbour/src/compiler/hbopt.c b/harbour/src/compiler/hbopt.c
index a8fca3aa4b..9bc5d0ffae 100644
--- a/harbour/src/compiler/hbopt.c
+++ b/harbour/src/compiler/hbopt.c
@@ -996,7 +996,7 @@ static HB_SHORT hb_compLocalGetNumber( HB_BYTE * pCode )
       case HB_P_POPLOCALNEAR:
       case HB_P_PUSHLOCALNEAR:
       case HB_P_LOCALNEARADDINT:
-         return * ( (signed char*) pCode + 1 );
+         return * ( ( signed char* ) pCode + 1 );
 
       case HB_P_POPLOCAL:
       case HB_P_PUSHLOCAL: