From 22835dc3a69ac9b14ebb1ae142c00aebbd3d9df1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 23 Aug 2008 15:02:49 +0000 Subject: [PATCH] 2008-08-23 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * tests/multifnc/t0.prg * tests/multifnc/t1.prg * tests/multifnc/t2.prg * source/rdd/usrrdd/example/exmemo.prg * source/rdd/usrrdd/example/exhsx.prg * source/rdd/usrrdd/example/exfcm.prg * source/rdd/usrrdd/example/exrlx.prg * contrib/xhb/hbsyslog.c * contrib/rddado/tests/mysql3.prg * contrib/rddado/tests/access1.prg * contrib/rddado/tests/access2.prg * contrib/rddado/tests/mysql1.prg * contrib/hbpgsql/tests/tstpgrdd.prg ! SVN headers. * contrib/hbwhat32/Makefile * contrib/hbwhat32/common.mak - contrib/hbwhat32/wintypes.ch - Removed wintypes.ch, as it collides with a header with the same name (and similar content) in xhb. It will now use the xhb one, since it already relied on other xhb headers anyway. If anyone wants to sort this out properly, pls do. --- harbour/ChangeLog | 25 ++++++ harbour/contrib/hbpgsql/tests/tstpgrdd.prg | 5 +- harbour/contrib/hbwhat32/Makefile | 1 - harbour/contrib/hbwhat32/common.mak | 1 - harbour/contrib/hbwhat32/wintypes.ch | 80 -------------------- harbour/contrib/rddado/tests/access1.prg | 4 + harbour/contrib/rddado/tests/access2.prg | 4 + harbour/contrib/rddado/tests/mysql1.prg | 4 + harbour/contrib/rddado/tests/mysql3.prg | 4 + harbour/contrib/xhb/hbsyslog.c | 4 + harbour/source/rdd/usrrdd/example/exfcm.prg | 4 + harbour/source/rdd/usrrdd/example/exhsx.prg | 4 + harbour/source/rdd/usrrdd/example/exmemo.prg | 4 + harbour/source/rdd/usrrdd/example/exrlx.prg | 4 + harbour/tests/multifnc/t0.prg | 4 + harbour/tests/multifnc/t1.prg | 4 + harbour/tests/multifnc/t2.prg | 4 + 17 files changed, 77 insertions(+), 83 deletions(-) delete mode 100644 harbour/contrib/hbwhat32/wintypes.ch diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 78547bcae8..d4999fdeaa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,31 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-23 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * tests/multifnc/t0.prg + * tests/multifnc/t1.prg + * tests/multifnc/t2.prg + * source/rdd/usrrdd/example/exmemo.prg + * source/rdd/usrrdd/example/exhsx.prg + * source/rdd/usrrdd/example/exfcm.prg + * source/rdd/usrrdd/example/exrlx.prg + * contrib/xhb/hbsyslog.c + * contrib/rddado/tests/mysql3.prg + * contrib/rddado/tests/access1.prg + * contrib/rddado/tests/access2.prg + * contrib/rddado/tests/mysql1.prg + * contrib/hbpgsql/tests/tstpgrdd.prg + ! SVN headers. + + * contrib/hbwhat32/Makefile + * contrib/hbwhat32/common.mak + - contrib/hbwhat32/wintypes.ch + - Removed wintypes.ch, as it collides with a header with + the same name (and similar content) in xhb. It will + now use the xhb one, since it already relied on other + xhb headers anyway. + If anyone wants to sort this out properly, pls do. + 2008-08-23 16:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbgt/Makefile * contrib/hbgt/common.mak diff --git a/harbour/contrib/hbpgsql/tests/tstpgrdd.prg b/harbour/contrib/hbpgsql/tests/tstpgrdd.prg index d22a37d46a..8cdcb2b876 100644 --- a/harbour/contrib/hbpgsql/tests/tstpgrdd.prg +++ b/harbour/contrib/hbpgsql/tests/tstpgrdd.prg @@ -1,9 +1,12 @@ +/* + * $Id$ + */ + /* The aim of this test is to check the same RDD functions and statements against a dbf file and the same dbf imported into a PostgreSQL database. Replace <...> with your data and configuration. */ - procedure main() local nConn diff --git a/harbour/contrib/hbwhat32/Makefile b/harbour/contrib/hbwhat32/Makefile index e6783b6553..a701d07cc3 100644 --- a/harbour/contrib/hbwhat32/Makefile +++ b/harbour/contrib/hbwhat32/Makefile @@ -80,7 +80,6 @@ PRG_HEADERS= \ wingdi.ch \ wininet.ch \ winstruc.ch \ - wintypes.ch \ winuser.ch \ # This lib needs xhb headers to compile, and this is diff --git a/harbour/contrib/hbwhat32/common.mak b/harbour/contrib/hbwhat32/common.mak index e9e9b0b68c..e9beae6e16 100644 --- a/harbour/contrib/hbwhat32/common.mak +++ b/harbour/contrib/hbwhat32/common.mak @@ -16,7 +16,6 @@ PRG_HEADERS = \ wingdi.ch \ wininet.ch \ winstruc.ch \ - wintypes.ch \ winuser.ch \ LIB_OBJS = \ diff --git a/harbour/contrib/hbwhat32/wintypes.ch b/harbour/contrib/hbwhat32/wintypes.ch deleted file mode 100644 index 7a1bbf336e..0000000000 --- a/harbour/contrib/hbwhat32/wintypes.ch +++ /dev/null @@ -1,80 +0,0 @@ -/* - * $Id$ - */ - -// What32 -// Windows type definitions - - -/* -NOTE: If you define INT as the C type, (eg. in WinTypes.ch) -It may clash with INT() function in Harbour. - -Make sure that when you use INT() function, you type it in mixed case -eg. Int(), otherwise, a difficult to trace and understand compile time -error will be occur. -*/ - - -//#include "cstruct.ch" - - -#Ifndef VOID - -#define VOID 0 -#define UINT -3 //CTYPE_UNSIGNED_INT -#define int 3 //CTYPE_INT -#define HANDLE -4 //CTYPE_UNSIGNED_LONG -#define HICON -4 //CTYPE_UNSIGNED_LONG -#define HBITMAP -4 //CTYPE_UNSIGNED_LONG -#define HCURSOR -4 //CTYPE_UNSIFNED_LONG -#define HBRUSH -4 //CTYPE_UNSIGNED_LONG -#define LPCSTR 10 //CTYPE_CHAR_PTR -#define WNDPROC -4 //CTYPE_UNSIGNED_LONG -#define BOOL 4 // 4 //CTYPE_LONG // ADD CTYPE_BOOL to xHarbour structures ( Please !!! ) -#define LPVOID 7 //CTYPE_VOID_PTR -#define DWORD -4 //CTYPE_UNSIGNED_LONG -#define WORD -2 //CTYPE_UNSIGNED_SHORT -#define LPCTSTR 10 //CTYPE_CHAR_PTR -#define COLORREF -4 //CTYPE_UNSIGNED_LONG -#define BYTE 1 //CTYPE_CHAR -#define TCHAR -1 //CTYPE_UNSIGNED_CHAR -#define HINSTANCE -4 //CTYPE_UNSIGNED_LONG -#define HMENU -4 //CTYPE_UNSIGNED_LONG -#define HTREEITEM -4 //CTYPE_UNSIGNED_LONG -#define INT 3 //CTYPE_INT -#define HWND -4 //CTYPE_UNSIGNED_LONG -#define LPARAM 4 //CTYPE_LONG -#define HGLOBAL -4 //CTYPE_UNSIGNED_LONG -#define WPARAM 3 //CTYPE_INT -#define HKEY -4 //CTYPE_UNSIGNED_LONG -#define char -1 //CTYPE_CHAR -#define LONG 4 //CTYPE_LONG -#define BCHAR -1 //CTYPE_UNSIGNED_CHAR -#define WCHAR -2 //CTYPE_UNSIGNED_SHORT -#define DOUBLE 6 //CTYPE_DOUBLE -#define LPTSTR 10 //CTYPE_CHAR_PTR -#define LPSTR 10 //CTYPE_CHAR_PTR -#define ULONG -4 //CTYPE_UNSIGNED_LONG -#define UCHAR -1 //CTYPE_UNSIGNED_CHAR -#define SHORT 2 -#define USHORT -2 -#define PVOID 7 //CTYPE_VOID_PTR -#define ULONG_PTR -40 //CTYPE_UNSIGNED_LONG_PTR - - -#define LPOFNHOOKPROC -4 // CTYPE_UNSIGNED_LONG -#define LPCFHOOKPROC -4 -#define LPFRHOOKPROC -4 -#define LPPAGESETUPHOOK -4 -#define LPPAGEPAINTHOOK -4 -#define LPPRINTHOOKPROC -4 -#define LPSETUPHOOKPROC -4 - -#define BFFCALLBACK -4 - -#define HDC -4 -#define HIMAGELIST -4 - -#endif - diff --git a/harbour/contrib/rddado/tests/access1.prg b/harbour/contrib/rddado/tests/access1.prg index b5a3e758f3..83ac5102c1 100644 --- a/harbour/contrib/rddado/tests/access1.prg +++ b/harbour/contrib/rddado/tests/access1.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #include "adordd.ch" REQUEST ADORDD diff --git a/harbour/contrib/rddado/tests/access2.prg b/harbour/contrib/rddado/tests/access2.prg index 545194be1e..9b5c5ae2c5 100644 --- a/harbour/contrib/rddado/tests/access2.prg +++ b/harbour/contrib/rddado/tests/access2.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + // Testing DbCreate() with Access database engine #include "adordd.ch" diff --git a/harbour/contrib/rddado/tests/mysql1.prg b/harbour/contrib/rddado/tests/mysql1.prg index d5531ac5e4..21b333bb24 100644 --- a/harbour/contrib/rddado/tests/mysql1.prg +++ b/harbour/contrib/rddado/tests/mysql1.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #include "adordd.ch" REQUEST ADORDD diff --git a/harbour/contrib/rddado/tests/mysql3.prg b/harbour/contrib/rddado/tests/mysql3.prg index 12d2d56907..1c800385b7 100644 --- a/harbour/contrib/rddado/tests/mysql3.prg +++ b/harbour/contrib/rddado/tests/mysql3.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + // Testing LOCATE and CONTINUE #include "adordd.ch" diff --git a/harbour/contrib/xhb/hbsyslog.c b/harbour/contrib/xhb/hbsyslog.c index ceb9d7a0c3..3b18107952 100644 --- a/harbour/contrib/xhb/hbsyslog.c +++ b/harbour/contrib/xhb/hbsyslog.c @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + /* Event logging system */ diff --git a/harbour/source/rdd/usrrdd/example/exfcm.prg b/harbour/source/rdd/usrrdd/example/exfcm.prg index 5dd095eb9d..d7c5d001c1 100644 --- a/harbour/source/rdd/usrrdd/example/exfcm.prg +++ b/harbour/source/rdd/usrrdd/example/exfcm.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + REQUEST FCOMMA PROC MAIN() diff --git a/harbour/source/rdd/usrrdd/example/exhsx.prg b/harbour/source/rdd/usrrdd/example/exhsx.prg index 0d7db59861..e4c22d1da6 100644 --- a/harbour/source/rdd/usrrdd/example/exhsx.prg +++ b/harbour/source/rdd/usrrdd/example/exhsx.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #include "dbinfo.ch" REQUEST HSXRDD diff --git a/harbour/source/rdd/usrrdd/example/exmemo.prg b/harbour/source/rdd/usrrdd/example/exmemo.prg index bda75db491..9c93cf78df 100644 --- a/harbour/source/rdd/usrrdd/example/exmemo.prg +++ b/harbour/source/rdd/usrrdd/example/exmemo.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + REQUEST DBTCDX REQUEST FPTCDX REQUEST SMTCDX diff --git a/harbour/source/rdd/usrrdd/example/exrlx.prg b/harbour/source/rdd/usrrdd/example/exrlx.prg index 5ca38f1895..83d35af06b 100644 --- a/harbour/source/rdd/usrrdd/example/exrlx.prg +++ b/harbour/source/rdd/usrrdd/example/exrlx.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + REQUEST RLCDX PROC MAIN() diff --git a/harbour/tests/multifnc/t0.prg b/harbour/tests/multifnc/t0.prg index a8d9308d5b..97955ef9d8 100644 --- a/harbour/tests/multifnc/t0.prg +++ b/harbour/tests/multifnc/t0.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + proc main() ? OS(), VERSION(), DATE(), TIME() ? HB_COMPILER() diff --git a/harbour/tests/multifnc/t1.prg b/harbour/tests/multifnc/t1.prg index e40240c18a..c547861a47 100644 --- a/harbour/tests/multifnc/t1.prg +++ b/harbour/tests/multifnc/t1.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + proc main2() ? "main2", procfile("main2"), procfile(@main2()) ? "alert", procfile("alert"), procfile(@alert()), alert() diff --git a/harbour/tests/multifnc/t2.prg b/harbour/tests/multifnc/t2.prg index b85336353f..13a884aa64 100644 --- a/harbour/tests/multifnc/t2.prg +++ b/harbour/tests/multifnc/t2.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + proc main3() ? "main3", procfile("main3"), procfile(@main3()) ? "alert", procfile("alert"), procfile(@alert()), alert()