0caff16650
- doc/en/hashes.txt
- doc/en/rdddb.txt
* .gitattributes
* contrib/3rd/sqlite3/sqlite3.hbp
* contrib/hbbz2/3rd/bz2/bz2.hbp
* contrib/hbexpat/3rd/expat/expat.hbp
* contrib/hbfimage/hbfimage.hbp
* contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
* contrib/hblzf/3rd/liblzf/lzf.hbp
* contrib/hbmxml/3rd/minixml/mxml.hbp
* contrib/hbmzip/3rd/minizip/minizip.hbp
* contrib/hbodbc/hbodbc.hbp
* contrib/hbtinymt/3rd/tinymt/tinymt.hbp
* contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
* contrib/sddsqlt3/tests/test.prg
* ChangeLog.txt
* doc/Makefile
* doc/oldnews.txt
* extras/ps32/readme.txt
* extras/superlib/readme.txt
* src/3rd/jpeg/Makefile
* src/3rd/pcre/Makefile
* src/3rd/png/Makefile
* src/3rd/tiff/Makefile
* src/3rd/zlib/Makefile
+ contrib/hbsms/DEPRECATED.txt
+ contrib/hbtpathy/DEPRECATED.txt
+ contrib/xhb/WARNING.txt
* contrib/3rd/sqlite3/sqlite3.dif -> contrib/3rd/sqlite3/sqlite3.diff
* contrib/hbbz2/3rd/bz2/bz2.dif -> contrib/hbbz2/3rd/bz2/bz2.diff
* contrib/hbexpat/3rd/expat/expat.dif -> contrib/hbexpat/3rd/expat/expat.diff
* contrib/hbhpdf/3rd/libhpdf/libhpdf.dif -> contrib/hbhpdf/3rd/libhpdf/libhpdf.diff
* contrib/hblzf/3rd/liblzf/liblzf.dif -> contrib/hblzf/3rd/liblzf/liblzf.diff
* contrib/hbmxml/3rd/minixml/minixml.dif -> contrib/hbmxml/3rd/minixml/minixml.diff
* contrib/hbmzip/3rd/minizip/minizip.dif -> contrib/hbmzip/3rd/minizip/minizip.diff
* contrib/hbtinymt/3rd/tinymt/tinymt.dif -> contrib/hbtinymt/3rd/tinymt/tinymt.diff
* contrib/hbxdiff/3rd/libxdiff/libxdiff.dif -> contrib/hbxdiff/3rd/libxdiff/xdiff.diff
* contrib/sddsqlt3/tests/test.sq3 -> contrib/sddsqlt3/tests/test.sqlite3
* extras/dbu/dbu52.dif -> extras/dbu/dbu52.patch
* extras/dbu/dbu53.dif -> extras/dbu/dbu53.patch
* extras/ps32/ps32.dif -> extras/ps32/ps32.patch
* extras/rl/rl.dif -> extras/rl/rl.patch
* extras/superlib/superlib.dif -> extras/superlib/superlib.patch
* extras/template/readme.txt -> extras/template/README.md
* src/3rd/hbdossrl/README -> src/3rd/hbdossrl/README.txt
* src/3rd/jpeg/jpeg.dif -> src/3rd/jpeg/jpeg.diff
* src/3rd/pcre/pcre.dif -> src/3rd/pcre/pcre.diff
* src/3rd/png/png.dif -> src/3rd/png/png.diff
* src/3rd/tiff/tiff.dif -> src/3rd/tiff/tiff.diff
* src/3rd/zlib/zlib.dif -> src/3rd/zlib/zlib.diff
* tests/hbpptest/_pp_test.prg -> tests/hbpp/_pp_test.prg
* tests/hbpptest/compare.hb -> tests/hbpp/compare.hb
* tests/hbpptest/hbpptest.hbp -> tests/hbpp/hbpptest.hbp
* tests/hbpptest/hbpptest.prg -> tests/hbpp/hbpptest.prg
* tests/tflock.prg -> tests/flock.prg
* contrib/hbfimage/fi_wrp.c -> contrib/hbfimage/core.c
* contrib/hbodbc/browodbc.prg -> contrib/hbodbc/browse.prg
* doc/cmdline.txt -> doc/cmdline.md
* extras/dbu/readme.txt -> extras/dbu/README.md
* extras/rl/readme.txt -> extras/rl/README.md
* some file renames synced with 3.4 fork, plus the content of
some of them. Some new text files added as well.
Note, 3rd party code rediffing won't work anymore on 8.3
filesystems.
105 lines
3.2 KiB
Diff
105 lines
3.2 KiB
Diff
diff -urN expat.orig/xmlparse.c expat/xmlparse.c
|
|
--- expat.orig/xmlparse.c 2017-07-24 16:57:23.412595132 +0200
|
|
+++ expat/xmlparse.c 2017-07-24 16:57:23.412595132 +0200
|
|
@@ -15,6 +15,12 @@
|
|
|
|
#ifdef _WIN32
|
|
#define getpid GetCurrentProcessId
|
|
+#elif defined(__WATCOMC__) && defined(__DOS__)
|
|
+#include <process.h> /* getpid() */
|
|
+#include <sys/timeb.h> /* ftime() */
|
|
+#elif defined(__WATCOMC__) && defined(__OS2__)
|
|
+#include <process.h> /* getpid() */
|
|
+#include <sys/time.h> /* gettimeofday() */
|
|
#else
|
|
#include <sys/time.h> /* gettimeofday() */
|
|
#include <sys/types.h> /* getpid() */
|
|
@@ -23,7 +29,9 @@
|
|
|
|
#define XML_BUILDING_EXPAT 1
|
|
|
|
-#ifdef _WIN32
|
|
+#ifdef HARBOUR_CONF
|
|
+#include "_hbconf.h"
|
|
+#elif defined(_WIN32)
|
|
#include "winconfi.h"
|
|
#elif defined(HAVE_EXPAT_CONFIG_H)
|
|
#include <expat_config.h>
|
|
@@ -749,11 +757,11 @@
|
|
static int
|
|
writeRandomBytes_RtlGenRandom(void * target, size_t count) {
|
|
int success = 0; /* full count bytes written? */
|
|
- const HMODULE advapi32 = LoadLibrary("ADVAPI32.DLL");
|
|
+ const HMODULE advapi32 = LoadLibrary(TEXT("ADVAPI32.DLL"));
|
|
|
|
if (advapi32) {
|
|
const RTLGENRANDOM_FUNC RtlGenRandom
|
|
- = (RTLGENRANDOM_FUNC)GetProcAddress(advapi32, "SystemFunction036");
|
|
+ = (RTLGENRANDOM_FUNC)HB_WINAPI_GETPROCADDRESS(advapi32, "SystemFunction036");
|
|
if (RtlGenRandom) {
|
|
if (RtlGenRandom((PVOID)target, (ULONG)count) == TRUE) {
|
|
success = 1;
|
|
@@ -771,10 +779,21 @@
|
|
static unsigned long
|
|
gather_time_entropy(void)
|
|
{
|
|
-#ifdef _WIN32
|
|
+#ifdef _WINCE
|
|
+ SYSTEMTIME st;
|
|
+ GetSystemTime(&st);
|
|
+ return ( ( ( ( long ) st.wDay * 24 +
|
|
+ st.wHour ) * 60 +
|
|
+ st.wMinute ) * 60 +
|
|
+ st.wSecond ) * 1000 + st.wMilliseconds;
|
|
+#elif defined(_WIN32)
|
|
FILETIME ft;
|
|
GetSystemTimeAsFileTime(&ft); /* never fails */
|
|
return ft.dwHighDateTime ^ ft.dwLowDateTime;
|
|
+#elif defined(__WATCOMC__) && defined(__DOS__)
|
|
+ struct timeb tb;
|
|
+ ftime( &tb );
|
|
+ return tb.time ^ tb.millitm;
|
|
#else
|
|
struct timeval tv;
|
|
int gettimeofday_res;
|
|
@@ -793,7 +812,11 @@
|
|
|
|
static unsigned long
|
|
ENTROPY_DEBUG(const char * label, unsigned long entropy) {
|
|
+#ifdef _WINCE
|
|
+ const char * const EXPAT_ENTROPY_DEBUG = NULL;
|
|
+#else
|
|
const char * const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
|
|
+#endif
|
|
if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
|
|
fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n",
|
|
label,
|
|
diff -urN expat.orig/xmlrole.c expat/xmlrole.c
|
|
--- expat.orig/xmlrole.c 2017-07-24 16:57:23.416595132 +0200
|
|
+++ expat/xmlrole.c 2017-07-24 16:57:23.456595133 +0200
|
|
@@ -4,7 +4,9 @@
|
|
|
|
#include <stddef.h>
|
|
|
|
-#ifdef _WIN32
|
|
+#ifdef HARBOUR_CONF
|
|
+#include "_hbconf.h"
|
|
+#elif defined(_WIN32)
|
|
#include "winconfi.h"
|
|
#else
|
|
#ifdef HAVE_EXPAT_CONFIG_H
|
|
diff -urN expat.orig/xmltok.c expat/xmltok.c
|
|
--- expat.orig/xmltok.c 2017-07-24 16:57:23.460595133 +0200
|
|
+++ expat/xmltok.c 2017-07-24 16:57:23.476595134 +0200
|
|
@@ -4,7 +4,9 @@
|
|
|
|
#include <stddef.h>
|
|
|
|
-#ifdef _WIN32
|
|
+#ifdef HARBOUR_CONF
|
|
+#include "_hbconf.h"
|
|
+#elif defined(_WIN32)
|
|
#include "winconfi.h"
|
|
#else
|
|
#ifdef HAVE_EXPAT_CONFIG_H
|