af3c47f30e
* contrib/hbmysql/tmysql.prg
! commented code converted to #if 0 block
! indentation
* contrib/3rd/sqlite3/*
* contrib/3rd/sqlite3/sqlite3.hbp
! updated to 3.7.15.2
37 lines
1.1 KiB
Plaintext
37 lines
1.1 KiB
Plaintext
diff -urN sqlite3.orig\sqlite3.c sqlite3\sqlite3.c
|
|
--- sqlite3.orig\sqlite3.c Thu Jan 10 16:22:50 2013
|
|
+++ sqlite3\sqlite3.c Thu Jan 10 16:22:50 2013
|
|
@@ -26421,7 +26421,11 @@
|
|
** is the same technique used by glibc to implement posix_fallocate()
|
|
** on systems that do not have a real fallocate() system call.
|
|
*/
|
|
+#if __minix
|
|
+ int nBlk = 4096; /* MFS default; good enough for now */
|
|
+#else
|
|
int nBlk = buf.st_blksize; /* File-system block size */
|
|
+#endif
|
|
i64 iWrite; /* Next offset to write to */
|
|
|
|
if( robust_ftruncate(pFile->h, nSize) ){
|
|
@@ -31729,6 +31733,11 @@
|
|
** substitute.
|
|
*/
|
|
/* #include <time.h> */
|
|
+#if defined( _MSC_VER )
|
|
+#define _LL( num ) num
|
|
+#else
|
|
+#define _LL( num ) num##LL
|
|
+#endif
|
|
struct tm *__cdecl localtime(const time_t *t)
|
|
{
|
|
static struct tm y;
|
|
@@ -31736,7 +31745,7 @@
|
|
SYSTEMTIME pTm;
|
|
sqlite3_int64 t64;
|
|
t64 = *t;
|
|
- t64 = (t64 + 11644473600)*10000000;
|
|
+ t64 = (t64 + _LL(11644473600))*10000000;
|
|
uTm.dwLowDateTime = (DWORD)(t64 & 0xFFFFFFFF);
|
|
uTm.dwHighDateTime= (DWORD)(t64 >> 32);
|
|
osFileTimeToLocalFileTime(&uTm,&lTm);
|