Mercurial > mxe-octave

annotate src/pstoedit-3-nosecapi.patch @ 3974:a6b0b01511ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pstoedit: update for msys build * src/pstoedit-3-nosecapi.patch: update patch
author John Donoghue
date Tue, 16 Jun 2015 12:18:59 -0400
parents 48a6501044c0
children 4ebe3efd8e98
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3667
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
1 diff -ur pstoedit-3.62.orig/src/cppcomp.h pstoedit-3.62/src/cppcomp.h
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
2 --- pstoedit-3.62.orig/src/cppcomp.h 2014-07-25 09:09:48 -0400
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
3 +++ pstoedit-3.62/src/cppcomp.h 2014-07-25 09:12:17 -0400
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
4 @@ -33,7 +33,12 @@
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
5 # define DLLEXPORT
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
6 #endif
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
7
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
8 -
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
9 +#ifdef __MINGW32__
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
10 + #include <_mingw.h>
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
11 + #ifdef MINGW_HAS_SECURE_API
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
12 + #undef MINGW_HAS_SECURE_API
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
13 + #endif
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
14 +#endif
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
15
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
16
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
17 #ifdef _AIX
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
18 diff -ur pstoedit-3.62.orig/src/lexyy.cpp pstoedit-3.62/src/lexyy.cpp
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
19 --- pstoedit-3.62.orig/src/lexyy.cpp 2014-07-25 09:19:14 -0400
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
20 +++ pstoedit-3.62/src/lexyy.cpp 2014-07-25 09:20:00 -0400
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
21 @@ -14,6 +14,7 @@
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
22 #endif
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
23
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
24 /* First, we deal with platform-specific or compiler-specific issues. */
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
25 +#include "cppcomp.h"
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
26
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
27 /* begin standard C headers. */
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
28 #include <stdio.h>
3974
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
29 diff -ur pstoedit-3.70.orig/src/fillpoly.cpp pstoedit-3.70/src/fillpoly.cpp
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
30 --- pstoedit-3.70.orig/src/fillpoly.cpp 2015-06-13 07:21:31.042850400 -0400
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
31 +++ pstoedit-3.70/src/fillpoly.cpp 2015-06-13 07:28:44.826540800 -0400
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
32 @@ -1,6 +1,6 @@
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
33 /* this file is taken from the hp2xx project (http://www.gnu.org/software/hp2xx/hp2xx.html)
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
34 and slightly adapted to fit into pstoedit s framework */
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
35 -
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
36 +#include "cppcomp.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
37 #include <stdio.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
38 #include <stdlib.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
39 #include <string.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
40 diff -ur pstoedit-3.70.orig/src/drvwmf.cpp pstoedit-3.70/src/drvwmf.cpp
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
41 --- pstoedit-3.70.orig/src/drvwmf.cpp 2015-06-13 08:02:48.035020200 -0400
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
42 +++ pstoedit-3.70/src/drvwmf.cpp 2015-06-13 08:03:33.555528400 -0400
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
43 @@ -22,6 +22,8 @@
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
44 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
45
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
46 */
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
47 +#include "cppcomp.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
48 +
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
49 #include "drvwmf.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
50
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
51 #include I_string_h