From 5b5f79db6881054d458172d252f54d05ade08150 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 26 Nov 2012 11:23:24 +0000
Subject: [PATCH] 2012-11-26 12:20 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbwin/hbwin.ch     ! added HB_ prefix to win defines

  * contrib/hbct/token2.c
  * contrib/xhb/bkgtsks.c
  * contrib/xhb/hbxml.h
    * cleanups

  * contrib/hbwin/axcore.c
    * formatting
---
 harbour/ChangeLog              | 12 ++++++++++++
 harbour/contrib/hbct/token2.c  |  5 ++---
 harbour/contrib/hbwin/axcore.c | 20 +++++++++++---------
 harbour/contrib/hbwin/hbwin.ch | 24 ++++++++++++------------
 harbour/contrib/xhb/bkgtsks.c  |  2 +-
 harbour/contrib/xhb/hbxml.h    |  6 +++---
 6 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 59d66cb4f6..1bd848b978 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -10,6 +10,18 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-26 12:20 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbwin/hbwin.ch
+    ! added HB_ prefix to win defines
+
+  * contrib/hbct/token2.c
+  * contrib/xhb/bkgtsks.c
+  * contrib/xhb/hbxml.h
+    * cleanups
+
+  * contrib/hbwin/axcore.c
+    * formatting
+
 2012-11-25 17:36 UTC+0100 Viktor Szakats (harbour syenar.net)
   * include/harbour.hbx
   * contrib/xhb/xhberr.prg
diff --git a/harbour/contrib/hbct/token2.c b/harbour/contrib/hbct/token2.c
index bf8b35d399..c3fed1b151 100644
--- a/harbour/contrib/hbct/token2.c
+++ b/harbour/contrib/hbct/token2.c
@@ -67,13 +67,12 @@
 
 #define TOKEN_ENVIRONMENT_STEP  100
 
-typedef struct _TOKEN_POSITION
+typedef struct
 {
    HB_SIZE sStartPos;            /* relative 0-based index of first char of token */
    HB_SIZE sEndPos;              /* relative 0-based index of first char BEHIND token,
                                     so that length = sEndPos-sStartPos */
-} TOKEN_POSITION;
-typedef TOKEN_POSITION * TOKEN_ENVIRONMENT;
+} TOKEN_POSITION, * TOKEN_ENVIRONMENT;
 
 /* alloc new token environment */
 static TOKEN_ENVIRONMENT sTokEnvNew( void )
diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c
index dd1e4fac68..13ef3135cc 100644
--- a/harbour/contrib/hbwin/axcore.c
+++ b/harbour/contrib/hbwin/axcore.c
@@ -240,14 +240,15 @@ typedef struct
 #endif
 
 
-typedef struct {
-   const IDispatchVtbl* lpVtbl;
-   DWORD                count;
-   IConnectionPoint*    pConnectionPoint;
-   DWORD                dwCookie;
-   IID                  rriid;
-   PHB_ITEM             pItemHandler;
-   HB_USHORT            uiClass;
+typedef struct
+{
+   const IDispatchVtbl * lpVtbl;
+   DWORD                 count;
+   IConnectionPoint *    pConnectionPoint;
+   DWORD                 dwCookie;
+   IID                   rriid;
+   PHB_ITEM              pItemHandler;
+   HB_USHORT             uiClass;
 } ISink;
 
 
@@ -368,7 +369,8 @@ static HRESULT STDMETHODCALLTYPE Invoke( IDispatch * lpThis, DISPID dispid, REFI
 }
 
 
-static const IDispatchVtbl ISink_Vtbl = {
+static const IDispatchVtbl ISink_Vtbl =
+{
    QueryInterface,
    AddRef,
    Release,
diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch
index 535db59e87..aaffebbd27 100644
--- a/harbour/contrib/hbwin/hbwin.ch
+++ b/harbour/contrib/hbwin/hbwin.ch
@@ -767,17 +767,17 @@
 
 /* RPC status code (win_UuidCreateString() first reference parameter) */
 #define HB_RPC_S_ERROR                     ( -1 )
-#define RPC_S_OK                           0
-#define RPC_S_INVALID_ARG                  87
-#define RPC_S_OUT_OF_MEMORY                14
-#define RPC_S_OUT_OF_THREADS               164
-#define RPC_S_INVALID_LEVEL                87
-#define RPC_S_BUFFER_TOO_SMALL             122
-#define RPC_S_INVALID_SECURITY_DESC        1338
-#define RPC_S_ACCESS_DENIED                5
-#define RPC_S_SERVER_OUT_OF_MEMORY         1130
-#define RPC_S_ASYNC_CALL_PENDING           997
-#define RPC_S_UNKNOWN_PRINCIPAL            1332
-#define RPC_S_TIMEOUT                      1460
+#define HB_RPC_S_OK                        0
+#define HB_RPC_S_INVALID_ARG               87
+#define HB_RPC_S_OUT_OF_MEMORY             14
+#define HB_RPC_S_OUT_OF_THREADS            164
+#define HB_RPC_S_INVALID_LEVEL             87
+#define HB_RPC_S_BUFFER_TOO_SMALL          122
+#define HB_RPC_S_INVALID_SECURITY_DESC     1338
+#define HB_RPC_S_ACCESS_DENIED             5
+#define HB_RPC_S_SERVER_OUT_OF_MEMORY      1130
+#define HB_RPC_S_ASYNC_CALL_PENDING        997
+#define HB_RPC_S_UNKNOWN_PRINCIPAL         1332
+#define HB_RPC_S_TIMEOUT                   1460
 
 #endif /* HBWIN_CH_ */
diff --git a/harbour/contrib/xhb/bkgtsks.c b/harbour/contrib/xhb/bkgtsks.c
index c29edfab03..8e02902323 100644
--- a/harbour/contrib/xhb/bkgtsks.c
+++ b/harbour/contrib/xhb/bkgtsks.c
@@ -68,7 +68,7 @@
 
 HB_EXTERN_BEGIN
 
-typedef struct HB_BACKGROUNDTASK_
+typedef struct
 {
    HB_ULONG ulTaskID;      /* task identifier */
    PHB_ITEM pTask;         /* pointer to the task item */
diff --git a/harbour/contrib/xhb/hbxml.h b/harbour/contrib/xhb/hbxml.h
index 45ab921577..991e2295d3 100644
--- a/harbour/contrib/xhb/hbxml.h
+++ b/harbour/contrib/xhb/hbxml.h
@@ -205,15 +205,15 @@ typedef struct tag_mxml_output
 
 } MXML_OUTPUT;
 
-
-typedef struct tag_mxml_self_growing_string
+/* tag mxml self growing string */
+typedef struct
 {
    char *  buffer;
    HB_ISIZ allocated;
    HB_ISIZ length;
 } MXML_SGS;
 
-typedef struct _hbxml_attribute
+typedef struct
 {
    PHB_ITEM pName;
    PHB_ITEM pValue;