diff --git a/harbour/ChangeLog b/harbour/ChangeLog index de9f302add..758e12325b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,22 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-08 14:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + * Changed to use 7za instead of 7z as 7zip cmdline tool name. + + * contrib/hbsqlit3/hbsqlit3.ch + * Formatting. + ; TOFIX: ? What is the meaning of this snipped in the header: + --- + #ifdef SQLITE_TEXT + #undef SQLITE_TEXT + #else + #define SQLITE_TEXT 3 + #endif + --- + Seems wrong to me. + 2009-10-07 16:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/wvtwin.ch + Added more WINAPI constants. diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.ch b/harbour/contrib/hbsqlit3/hbsqlit3.ch index f11c61fad1..07f48afc7f 100644 --- a/harbour/contrib/hbsqlit3/hbsqlit3.ch +++ b/harbour/contrib/hbsqlit3/hbsqlit3.ch @@ -54,109 +54,109 @@ #ifndef HBSQLIT3_CH_ #define HBSQLIT3_CH_ -#xtranslate DB_IS_OPEN( ) => !Empty( ) -#xtranslate STMT_IS_PREPARED( ) => !Empty( ) +#xtranslate DB_IS_OPEN( ) => ( ! Empty( ) ) +#xtranslate STMT_IS_PREPARED( ) => ( ! Empty( ) ) /* Fundamental Datatypes */ -#define SQLITE_INTEGER 1 -#define SQLITE_FLOAT 2 +#define SQLITE_INTEGER 1 +#define SQLITE_FLOAT 2 #ifdef SQLITE_TEXT #undef SQLITE_TEXT #else - #define SQLITE_TEXT 3 + #define SQLITE_TEXT 3 #endif -#define SQLITE3_TEXT 3 -#define SQLITE_BLOB 4 -#define SQLITE_NULL 5 - -#define SQLITE_OK 0 /* Successful result */ -/* Beginning-of-Error-Codes */ -#define SQLITE_ERROR 1 /* SQL error or missing database */ -#define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */ -#define SQLITE_PERM 3 /* Access permission denied */ -#define SQLITE_ABORT 4 /* Callback routine requested an abort */ -#define SQLITE_BUSY 5 /* The database file is locked */ -#define SQLITE_LOCKED 6 /* A table in the database is locked */ -#define SQLITE_NOMEM 7 /* A malloc() failed */ -#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ -#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ -#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ -#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ -#define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ -#define SQLITE_FULL 13 /* Insertion failed because database is full */ -#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ -#define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ -#define SQLITE_EMPTY 16 /* Database is empty */ -#define SQLITE_SCHEMA 17 /* The database schema changed */ -#define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ -#define SQLITE_CONSTRAINT 19 /* Abort due to constraint violation */ -#define SQLITE_MISMATCH 20 /* Data type mismatch */ -#define SQLITE_MISUSE 21 /* Library used incorrectly */ -#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ -#define SQLITE_AUTH 23 /* Authorization denied */ -#define SQLITE_FORMAT 24 /* Auxiliary database format error */ -#define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ -#define SQLITE_NOTADB 26 /* File opened that is not a database file */ -#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ -#define SQLITE_DONE 101 /* sqlite3_step() has finished executing */ +#define SQLITE3_TEXT 3 +#define SQLITE_BLOB 4 +#define SQLITE_NULL 5 + +#define SQLITE_OK 0 /* Successful result */ +/* Beginning-of-Error-Codes */ +#define SQLITE_ERROR 1 /* SQL error or missing database */ +#define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */ +#define SQLITE_PERM 3 /* Access permission denied */ +#define SQLITE_ABORT 4 /* Callback routine requested an abort */ +#define SQLITE_BUSY 5 /* The database file is locked */ +#define SQLITE_LOCKED 6 /* A table in the database is locked */ +#define SQLITE_NOMEM 7 /* A malloc() failed */ +#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ +#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ +#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ +#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ +#define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ +#define SQLITE_FULL 13 /* Insertion failed because database is full */ +#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ +#define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ +#define SQLITE_EMPTY 16 /* Database is empty */ +#define SQLITE_SCHEMA 17 /* The database schema changed */ +#define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ +#define SQLITE_CONSTRAINT 19 /* Abort due to constraint violation */ +#define SQLITE_MISMATCH 20 /* Data type mismatch */ +#define SQLITE_MISUSE 21 /* Library used incorrectly */ +#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ +#define SQLITE_AUTH 23 /* Authorization denied */ +#define SQLITE_FORMAT 24 /* Auxiliary database format error */ +#define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ +#define SQLITE_NOTADB 26 /* File opened that is not a database file */ +#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ +#define SQLITE_DONE 101 /* sqlite3_step() has finished executing */ /* End-of-Error-Codes */ /* Combination of the following bit values are used as the third argument to the sqlite3_open_v2() interface */ -#define SQLITE_OPEN_READONLY 1 -#define SQLITE_OPEN_READWRITE 2 -#define SQLITE_OPEN_CREATE 4 -#define SQLITE_OPEN_DELETEONCLOSE 8 -#define SQLITE_OPEN_EXCLUSIVE 16 -#define SQLITE_OPEN_MAIN_DB 256 -#define SQLITE_OPEN_TEMP_DB 512 -#define SQLITE_OPEN_TRANSIENT_DB 1024 -#define SQLITE_OPEN_MAIN_JOURNAL 2048 -#define SQLITE_OPEN_TEMP_JOURNAL 4096 -#define SQLITE_OPEN_SUBJOURNAL 8192 -#define SQLITE_OPEN_MASTER_JOURNAL 16384 +#define SQLITE_OPEN_READONLY 1 +#define SQLITE_OPEN_READWRITE 2 +#define SQLITE_OPEN_CREATE 4 +#define SQLITE_OPEN_DELETEONCLOSE 8 +#define SQLITE_OPEN_EXCLUSIVE 16 +#define SQLITE_OPEN_MAIN_DB 256 +#define SQLITE_OPEN_TEMP_DB 512 +#define SQLITE_OPEN_TRANSIENT_DB 1024 +#define SQLITE_OPEN_MAIN_JOURNAL 2048 +#define SQLITE_OPEN_TEMP_JOURNAL 4096 +#define SQLITE_OPEN_SUBJOURNAL 8192 +#define SQLITE_OPEN_MASTER_JOURNAL 16384 /* Status Parameters for prepared statements */ -#define SQLITE_STMTSTATUS_FULLSCAN_STEP 1 -#define SQLITE_STMTSTATUS_SORT 2 +#define SQLITE_STMTSTATUS_FULLSCAN_STEP 1 +#define SQLITE_STMTSTATUS_SORT 2 /* Authorizer Action Codes */ -#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ -#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ -#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ -#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ -#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ -#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ -#define SQLITE_DELETE 9 /* Table Name NULL */ -#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ -#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ -#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ -#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ -#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ -#define SQLITE_DROP_VIEW 17 /* View Name NULL */ -#define SQLITE_INSERT 18 /* Table Name NULL */ -#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ -#define SQLITE_READ 20 /* Table Name Column Name */ -#define SQLITE_SELECT 21 /* NULL NULL */ -#define SQLITE_TRANSACTION 22 /* Operation NULL */ -#define SQLITE_UPDATE 23 /* Table Name Column Name */ -#define SQLITE_ATTACH 24 /* Filename NULL */ -#define SQLITE_DETACH 25 /* Database Name NULL */ -#define SQLITE_ALTER_TABLE 26 /* Database Name Table Name */ -#define SQLITE_REINDEX 27 /* Index Name NULL */ -#define SQLITE_ANALYZE 28 /* Table Name NULL */ -#define SQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ -#define SQLITE_DROP_VTABLE 30 /* Table Name Module Name */ -#define SQLITE_FUNCTION 31 /* NULL Function Name */ -#define SQLITE_SAVEPOINT 32 /* Operation Savepoint Name */ - -/* Authorizer Return Codes */ -#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ -#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ +#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ +#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ +#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ +#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ +#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ +#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ +#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ +#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ +#define SQLITE_DELETE 9 /* Table Name NULL */ +#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ +#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ +#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ +#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ +#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ +#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ +#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ +#define SQLITE_DROP_VIEW 17 /* View Name NULL */ +#define SQLITE_INSERT 18 /* Table Name NULL */ +#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ +#define SQLITE_READ 20 /* Table Name Column Name */ +#define SQLITE_SELECT 21 /* NULL NULL */ +#define SQLITE_TRANSACTION 22 /* Operation NULL */ +#define SQLITE_UPDATE 23 /* Table Name Column Name */ +#define SQLITE_ATTACH 24 /* Filename NULL */ +#define SQLITE_DETACH 25 /* Database Name NULL */ +#define SQLITE_ALTER_TABLE 26 /* Database Name Table Name */ +#define SQLITE_REINDEX 27 /* Index Name NULL */ +#define SQLITE_ANALYZE 28 /* Table Name NULL */ +#define SQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ +#define SQLITE_DROP_VTABLE 30 /* Table Name Module Name */ +#define SQLITE_FUNCTION 31 /* NULL Function Name */ +#define SQLITE_SAVEPOINT 32 /* Operation Savepoint Name */ + +/* Authorizer Return Codes */ +#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ +#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ /* Status Parameters */ #define SQLITE_STATUS_MEMORY_USED 0 @@ -171,4 +171,5 @@ /* Status Parameters for database connections */ #define SQLITE_DBSTATUS_LOOKASIDE_USED 0 + #endif diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index c9aa2485f0..2ae60b907e 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -73,6 +73,6 @@ echo "hb20\examples\*.*" >> _hbfiles echo "hb20\contrib\*.*" >> _hbfiles if exist harbour-2.0.0beta3-win-20090905.7z del harbour-2.0.0beta3-win-20090905.7z -7z a -r harbour-2.0.0beta3-win-20090905.7z @_hbfiles +7za a -r harbour-2.0.0beta3-win-20090905.7z @_hbfiles del _hbfiles