Mercurial > mxe-octave

annotate src/pstoedit-3-nosecapi.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents 4ebe3efd8e98
children
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/lexyy.cpp pstoedit-3.62/src/lexyy.cpp
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
2 --- 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
3 +++ 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
4 @@ -14,6 +14,7 @@
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
5 #endif
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
6
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
7 /* First, we deal with platform-specific or compiler-specific issues. */
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
8 +#include "cppcomp.h"
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
9
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
10 /* begin standard C headers. */
48a6501044c0 pstoedit: allow native compile with w64
John Donoghue
parents:
diff changeset
11 #include <stdio.h>
3974
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
12 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
13 --- 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
14 +++ 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
15 @@ -1,6 +1,6 @@
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
16 /* 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
17 and slightly adapted to fit into pstoedit s framework */
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
18 -
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
19 +#include "cppcomp.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
20 #include <stdio.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
21 #include <stdlib.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
22 #include <string.h>
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
23 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
24 --- 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
25 +++ 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
26 @@ -22,6 +22,8 @@
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
27 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
28
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
29 */
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
30 +#include "cppcomp.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
31 +
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
32 #include "drvwmf.h"
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
33
a6b0b01511ba pstoedit: update for msys build
John Donoghue
parents: 3667
diff changeset
34 #include I_string_h
5438
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
35 diff -ur pstoedit-3.75.orig/src/cppcomp.h pstoedit-3.75/src/cppcomp.h
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
36 --- pstoedit-3.75.orig/src/cppcomp.h 2020-05-29 11:11:05.064392865 -0400
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
37 +++ pstoedit-3.75/src/cppcomp.h 2020-05-29 11:20:09.056541850 -0400
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
38 @@ -230,7 +230,7 @@
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
39
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
40
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
41 //{
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
42 -#if defined(_MSC_VER) && (_MSC_VER >= 1400)
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
43 +#if (defined(_MSC_VER) && (_MSC_VER >= 1400)) || defined(__MINGW32__)
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
44 // for MS VS 8 (== cl version 14) we can use the new secure *_s string functions
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
45 // for other systems we have to "emulate" them
4ebe3efd8e98 * src/pstoedit-3-nosecapi.patch: update patch as mingw does support secure api
John Donoghue <john.donoghue@ieee.org>
parents: 3974
diff changeset
46 #define TARGETWITHLEN(str,len) str,len