Mercurial > mxe-octave

annotate src/msvc-pstoedit-1.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents 824f84572d1e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3124
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur pstoedit-3.61-orig/src/dynload.cpp pstoedit-3.61/src/dynload.cpp
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- pstoedit-3.61-orig/src/dynload.cpp 2012-08-28 09:52:31 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ pstoedit-3.61/src/dynload.cpp 2013-07-05 23:48:11 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -434,7 +434,7 @@
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 // errstream << "szExePath " << szExePath << endl;
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 if ((STRICMP(fullname, szExePath) != 0)
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - && (STRICMP(finddata.cFileName, "pstoedit.dll") != 0)) {
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + && (strstr(finddata.cFileName, "pstoedit") == NULL)) {
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 // avoid loading dll itself again
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 // errstream << "loading " << fullname << endl;
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 loadaPlugin(fullname, errstream, verbose);
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 diff -ur pstoedit-3.61-orig/src/miscutil.cpp pstoedit-3.61/src/miscutil.cpp
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 --- pstoedit-3.61-orig/src/miscutil.cpp 2012-08-28 09:52:31 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +++ pstoedit-3.61/src/miscutil.cpp 2013-07-05 23:36:21 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 @@ -26,7 +26,7 @@
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 // #ifdef _MSC_VER
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 // for getcwd ( at least for Visual C++)
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 -#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) || defined(__APPLE__) || defined(_AIX)
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 +#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) || defined(__APPLE__) || defined(_AIX) || defined(_MSC_VER)
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 #include <unistd.h>
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 #ifdef __hpux
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 diff -ur pstoedit-3.61-orig/src/pstoedit.cpp pstoedit-3.61/src/pstoedit.cpp
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 --- pstoedit-3.61-orig/src/pstoedit.cpp 2012-08-28 09:52:31 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +++ pstoedit-3.61/src/pstoedit.cpp 2013-07-05 23:50:53 -0400
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 @@ -263,7 +263,12 @@
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 if (verbose) errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 char *p = 0;
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 + int len;
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 *p = '\0';
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 + if ((len = strlen (szExePath)) >= 4 && STRICMP (&szExePath[len-4], "\\bin") == 0) {
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 + strcpy (&szExePath[len-3], "lib");
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 + strncat (szExePath, "\\pstoedit", sizeof (szExePath));
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 + }
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 if (strcmp(szExePath, plugindir.value() ? plugindir.value() : "") != 0) {
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 loadPlugInDrivers(szExePath, errstream,verbose);
824f84572d1e [MSVC] enable pstoedit compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 pluginsloaded = true;