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 15:02:49 +00:00
parent 5c3718eeba
commit 22835dc3a6
17 changed files with 77 additions and 83 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,31 @@
   2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+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
--- 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
--- 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 
--- 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 = \
--- a/harbour/contrib/hbwhat32/wintypes.ch
+++ b/harbour/contrib/hbwhat32/wintypes.ch
@@ -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
-
--- a/harbour/contrib/rddado/tests/access1.prg
+++ b/harbour/contrib/rddado/tests/access1.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 #include "adordd.ch"

 REQUEST ADORDD
--- 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"
--- a/harbour/contrib/rddado/tests/mysql1.prg
+++ b/harbour/contrib/rddado/tests/mysql1.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 #include "adordd.ch"

 REQUEST ADORDD
--- 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"
--- a/harbour/contrib/xhb/hbsyslog.c
+++ b/harbour/contrib/xhb/hbsyslog.c
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 /*
   Event logging system
 */
--- 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()
--- 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
--- 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
--- 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()
--- 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()
--- 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()
--- 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()