Mercurial > mxe-octave

comparison src/pstoedit-1-fixes.patch @ 2952:09a58eb274f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include pstoedit as a dependency of Octave
author John W. Eaton <jwe@octave.org>
date Tue, 08 Jan 2013 22:31:24 -0500
parents
children ea3cab4018c5
comparison
equal deleted inserted replaced
2951:01a2b5484d88 2952:09a58eb274f4
1 diff -uNr e/othersrc/gsdllinc/wgsver.c f/othersrc/gsdllinc/wgsver.c
2 --- e/othersrc/gsdllinc/wgsver.c 2010-12-27 10:09:35.000000000 -0500
3 +++ f/othersrc/gsdllinc/wgsver.c 2013-01-08 22:23:09.775545031 -0500
4 @@ -39,6 +39,10 @@
5 #include <stdlib.h>
6 #include "wgsver.h"
7
8 +#ifndef KEY_WOW64_64KEY
9 +#define KEY_WOW64_64KEY 0x0100
10 +#endif
11 +
12 /* Ghostscript may be known in the Windows Registry by
13 * the following names.
14 */
15 diff -uNr e/src/cbstream.cpp f/src/cbstream.cpp
16 --- e/src/cbstream.cpp 2012-08-28 09:52:28.000000000 -0400
17 +++ f/src/cbstream.cpp 2013-01-08 22:15:04.575971765 -0500
18 @@ -33,6 +33,8 @@
19 // this code is only needed under WIN32
20 // ...and under OS/2
21
22 +#include <cstdio>
23 +
24 #include "cppcomp.h"
25
26 #include "cbstream.h"
27 diff -uNr e/src/Makefile.am f/src/Makefile.am
28 --- e/src/Makefile.am 2010-08-22 09:54:28.000000000 -0400
29 +++ f/src/Makefile.am 2013-01-08 22:28:40.596345408 -0500
30 @@ -133,7 +133,8 @@
31 genericints.h \
32 version.h
33
34 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
35 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
36 +libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc
37 libpstoedit_la_LDFLAGS = -no-undefined
38
39 pstoedit_SOURCES = cmdmain.cpp