Mercurial > mxe-octave

comparison src/pstoedit-1-fixes.patch @ 3813:ea3cab4018c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pstoedit: update 4.70 * src/pstoedit-2-gs.patch: update patch * src/pstoedit.mk: update version, checksum * src/pstoedit-1-fixes.patc: updatepatch
author John Donoghue
date Fri, 27 Feb 2015 15:29:26 -0500
parents 09a58eb274f4
children 3c5634c6a422
comparison
equal deleted inserted replaced
3812:82bd7cd7d06d 3813:ea3cab4018c5
35 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm 35 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
36 +libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc 36 +libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc
37 libpstoedit_la_LDFLAGS = -no-undefined 37 libpstoedit_la_LDFLAGS = -no-undefined
38 38
39 pstoedit_SOURCES = cmdmain.cpp 39 pstoedit_SOURCES = cmdmain.cpp
40 diff -ur pstoedit-3.70.orig/src/dynload.cpp pstoedit-3.70/src/dynload.cpp
41 --- pstoedit-3.70.orig/src/dynload.cpp 2015-02-27 11:26:42.674665283 -0500
42 +++ pstoedit-3.70/src/dynload.cpp 2015-02-27 11:28:12.270406665 -0500
43 @@ -229,7 +229,7 @@
44 #if defined(__linux) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__hpux) || defined(__sparc) || defined(__OS2__) || defined(_AIX) || (defined (HAVE_DLFCN_H) && (HAVE_DLFCN_H==1 ) )
45 DynLoader::fptr rfptr = ptr_to_fptr(dlsym(handle, name)); //lint !e611 //: Suspicious cast
46 #elif defined(_WIN32)
47 - DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
48 + DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name)); //lint !e611 //: Suspicious cast
49 #else
50 #error "system unsupported so far"
51 #endif
52 diff -ur pstoedit-3.70.orig/src/pstoedit.cpp pstoedit-3.70/src/pstoedit.cpp
53 --- pstoedit-3.70.orig/src/pstoedit.cpp 2015-02-27 13:34:44.955166896 -0500
54 +++ pstoedit-3.70/src/pstoedit.cpp 2015-02-27 13:36:47.962690034 -0500
55 @@ -269,10 +269,12 @@
56 char *p = 0;
57 if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
58 *p = '\0';
59 +/* disabled load in exe dir --
60 if (!strequal(szExePath, plugindir.c_str())) {
61 loadPlugInDrivers(szExePath, errstream,verbose);
62 pluginsloaded = true;
63 }
64 +*/
65 }
66 // now try also $exepath/../lib/pstoedit
67 strcat_s(szExePath,1000,"/../lib/pstoedit");