Mercurial > mxe-octave
changeset 3667:48a6501044c0
pstoedit: allow native compile with w64
* src/pstoedit-3-nosecapi.patch: new file
* dist-files.mk: add patch to file list.
author | John Donoghue |
---|---|
date | Fri, 25 Jul 2014 10:28:02 -0400 |
parents | 15551fc621fa |
children | ceeb3ec75690 |
files | dist-files.mk src/pstoedit-3-nosecapi.patch |
diffstat | 2 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sat Jul 26 12:32:10 2014 -0400 +++ b/dist-files.mk Fri Jul 25 10:28:02 2014 -0400 @@ -502,6 +502,7 @@ protobuf.mk \ pstoedit-1-fixes.patch \ pstoedit-2-gs.patch \ + pstoedit-3-nosecapi.patch \ pstoedit.mk \ pthreads-1-fixes.patch \ pthreads-test.c \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pstoedit-3-nosecapi.patch Fri Jul 25 10:28:02 2014 -0400 @@ -0,0 +1,28 @@ +diff -ur pstoedit-3.62.orig/src/cppcomp.h pstoedit-3.62/src/cppcomp.h +--- pstoedit-3.62.orig/src/cppcomp.h 2014-07-25 09:09:48 -0400 ++++ pstoedit-3.62/src/cppcomp.h 2014-07-25 09:12:17 -0400 +@@ -33,7 +33,12 @@ + # define DLLEXPORT + #endif + +- ++#ifdef __MINGW32__ ++ #include <_mingw.h> ++ #ifdef MINGW_HAS_SECURE_API ++ #undef MINGW_HAS_SECURE_API ++ #endif ++#endif + + + #ifdef _AIX +diff -ur pstoedit-3.62.orig/src/lexyy.cpp pstoedit-3.62/src/lexyy.cpp +--- pstoedit-3.62.orig/src/lexyy.cpp 2014-07-25 09:19:14 -0400 ++++ pstoedit-3.62/src/lexyy.cpp 2014-07-25 09:20:00 -0400 +@@ -14,6 +14,7 @@ + #endif + + /* First, we deal with platform-specific or compiler-specific issues. */ ++#include "cppcomp.h" + + /* begin standard C headers. */ + #include <stdio.h>