smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from kiwix/ctpp2_patche_mingw32 

Update ctpp2 patches to handle mingw32 compilation with meson 0.40.0
This commit is contained in:
Kelson 2017-04-24 13:57:17 +02:00 committed by GitHub
parent db9f277188 2e14765a38
commit 311af61de3
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ctpp2_mingw32.patch
View File

@ -83,3 +83,27 @@ diff -ur ctpp2-2.8.3/src/functions/FnRandom.cpp ctpp2-2.8.3.patched/src/function
srandomdev();
#else
srandom(time(NULL));
diff -ur ctpp2-2.8.3/include/CTPP2GlobalDefines.h ctpp2-2.8.3.patche/include/CTPP2GlobalDefines.h
--- ctpp2-2.8.3/include/CTPP2GlobalDefines.h 2012-08-02 09:22:44.000000000 +0200
+++ ctpp2-2.8.3.patched/include/CTPP2GlobalDefines.h 2017-04-24 10:59:54.236256866 +0200
@@ -92,7 +92,7 @@
/*
* Header files
*/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__MINGW32__)
#ifndef HAVE_SYS_TIME_H
#error "Cannot find header file `sys/time.h'"
diff -ur ctpp2-2.8.3/include/CTPP2SysTypes.h ctpp2-2.8.3.patche/include/CTPP2SysTypes.h
--- ctpp2-2.8.3/include/CTPP2SysTypes.h 2012-08-02 09:22:44.000000000 +0200
+++ ctpp2-2.8.3.patched/include/CTPP2SysTypes.h 2017-04-24 11:00:42.284545293 +0200
@@ -227,7 +227,7 @@
typedef UCCHAR_8 * UCCHAR_P;
-#elif WIN32 /* FreeBSD End, start of Win32 declarations */
+#elif WIN32 || __MINGW32__ /* FreeBSD End, start of Win32 declarations */
/**
@var typedef __int16 INT_16