From 2c0bf6bc84aafd76850e0b8062210b4bd59c6202 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 3 Nov 2010 01:58:52 +0000
Subject: [PATCH] 2010-11-03 02:58 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * external/sqlite3/Makefile     + Cygwin patch from Tamas
 Tevesz.

  * contrib/hbqt/qtcore/hbqt_pointer.cpp
    * Formatting.
---
 harbour/ChangeLog                            |  7 +++++++
 harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp |  4 ----
 harbour/external/sqlite3/Makefile            | 11 +++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 60dfacabdf..bc121dd65c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-03 02:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * external/sqlite3/Makefile
+    + Cygwin patch from Tamas Tevesz.
+
+  * contrib/hbqt/qtcore/hbqt_pointer.cpp
+    * Formatting.
+
 2010-11-03 00:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/utils/hbqtgen.prg
     % Simplified GC release code.
diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
index bd6a8ed37e..6d69738663 100644
--- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
+++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
@@ -118,9 +118,7 @@ void * hbqt_par_obj( int iParam )
       HBQT_GC_T * p;
       p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
       if( p && p->ph )
-      {
          return p->ph;
-      }
    }
 
    return NULL;
@@ -246,9 +244,7 @@ void * hbqt_detachgcpointer( int iParam )
       return hbqt_detachgcpointer( -1 );
    }
    else
-   {
       return NULL;
-   }
 }
 
 HB_FUNC( __HBQT_ISPOINTER )
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index 7629082954..41acfe4cc7 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -29,10 +29,13 @@ endif
 ifeq ($(HB_HOST_PLAT)-$(HB_COMPILER),dos-watcom)
    HB_SUPPORTED := no
 endif
-# NOTE: disable *nix builds on non-*nix platforms. [vszakats]
-ifeq ($(HB_HOST_PLAT_UNIX),)
-   ifneq ($(HB_PLATFORM_UNIX),)
-      HB_SUPPORTED := no
+# NOTE: disable *nix builds on non-*nix platforms; [vszakats]
+#       except for cygwin-on-win
+ifneq ($(HB_HOST_PLAT)-$(HB_PLATFORM),win-cygwin)
+   ifeq ($(HB_HOST_PLAT_UNIX),)
+      ifneq ($(HB_PLATFORM_UNIX),)
+         HB_SUPPORTED := no
+      endif
    endif
 endif