From 79edb64b311501fcf6fd81df82e09b207c5b9d70 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Sat, 1 Dec 2007 14:26:48 +0000 Subject: [PATCH] 2007-12-01 15:27 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/source/rtl/hbinet.c ! Fixed compilation under Cygwin environment * harbour/make_gcc.sh + Added Cygwin as a detected platform --- harbour/ChangeLog | 61 +++++++++++++++++++++---------------- harbour/make_gcc.sh | 10 ++++-- harbour/source/rtl/hbinet.c | 6 +++- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ed7d3317a5..ba03f5ea6b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,14 +8,21 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-01 15:27 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/source/rtl/hbinet.c + ! Fixed compilation under Cygwin environment + + * harbour/make_gcc.sh + + Added Cygwin as a detected platform + 2007-12-01 03:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * debian/copyright * doc/license.txt * COPYING - Removed one explicily listed license exception: - 'samples\pe\license.txt', since it is now in the contrib + 'samples\pe\license.txt', since it is now in the contrib which is covered in the "contrib license" section anyway. - This license is probably included only as an example + This license is probably included only as an example file for the editor. Ryszard? 2007-12-01 03:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) @@ -47,34 +54,34 @@ Old Old New DIR LIBNAME DIR & LIBNAME ----------- ------------- ------------- - adordd adordd hbrddado - apollo apollo hbapollo - bmdbfcdx bmdbfcdx hbbmcdx - btree hbbtree hbbtree - directx hbwin32ddrw hbw32ddr - firebird firebird hbfbird - freeimage hbfreeimage hbfimage - gd hbgd hbgd - gtwvg gtwvg hbgtwvg + adordd adordd hbrddado + apollo apollo hbapollo + bmdbfcdx bmdbfcdx hbbmcdx + btree hbbtree hbbtree + directx hbwin32ddrw hbw32ddr + firebird firebird hbfbird + freeimage hbfreeimage hbfimage + gd hbgd hbgd + gtwvg gtwvg hbgtwvg hbzlib hbziparch hbziparch htmllib html (DELETED) - libct ct hbct - libgt gt hbgt - libmisc hbmisc hbmisc - libnf nf hbnf - msql msql hbmsql - mysql hbmysql hbmysql - odbc hbodbc hbodbc - ole hbole hbole + libct ct hbct + libgt gt hbgt + libmisc hbmisc hbmisc + libnf nf hbnf + msql msql hbmsql + mysql hbmysql hbmysql + odbc hbodbc hbodbc + ole hbole hbole pdflib hbpdflib (DELETED) - pgsql hbpg hbpgsql - rdd_ads rddads hbrddads - samples samples hbclipsm - telepath telepath hbtpathy - tip tip hbtip - what32 what32 hbwhat32 - win32 hbwin32 hbw32 - xhb xhb xhb + pgsql hbpg hbpgsql + rdd_ads rddads hbrddads + samples samples hbclipsm + telepath telepath hbtpathy + tip tip hbtip + what32 what32 hbwhat32 + win32 hbwin32 hbw32 + xhb xhb xhb hgf hgf* hbgf* 2007-12-01 02:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index 86e73e64ce..3faebbef67 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -15,8 +15,9 @@ if [ -z "$HB_ARCHITECTURE" ]; then hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null` case "$hb_arch" in *windows*|*mingw32*|msys*) hb_arch="w32" ;; - *dos) hb_arch="dos" ;; - *bsd) hb_arch="bsd" ;; + *cygwin*) hb_arch="cyg" ;; + *dos) hb_arch="dos" ;; + *bsd) hb_arch="bsd" ;; esac fi export HB_ARCHITECTURE="$hb_arch" @@ -83,6 +84,11 @@ case "$HB_ARCHITECTURE" in OS_LIBS="-luser32 -lwinspool -lwsock32" EXEEXT=".exe" ;; + cyg) HB_OS="CYGWIN" + GT_LIST="${GT_LIST} WIN WVT GUI" + OS_LIBS="-luser32 -lwinspool" + EXEEXT=".exe" + ;; dos) HB_OS="DOS" GT_LIST="DOS" EXEEXT=".exe" diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c index 27af8c9f3b..8935a9bc1c 100644 --- a/harbour/source/rtl/hbinet.c +++ b/harbour/source/rtl/hbinet.c @@ -56,11 +56,15 @@ * */ - #include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" +/* Compile in Unix mode under Cygwin */ +#ifdef OS_UNIX_COMPATIBLE + #undef HB_OS_WIN_32 +#endif + /* HB_INET_H_ */ #if defined( HB_OS_DOS )