Mercurial > mxe-octave
view src/transfig-1-fixes.patch @ 7199:ea296e38047a default tip @
maint: Merge release to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 16 May 2024 11:42:51 +0200 |
parents | 1490118493f0 |
children |
line wrap: on
line source
diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c --- fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c 2021-09-06 12:57:54.175751149 -0400 +++ fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c 2021-09-06 13:10:27.022794005 -0400 @@ -95,6 +95,13 @@ static int border_margin = 0; static int smooth = 0; +#if defined (__WIN32__) || !defined (__CYGWIN__) + #define WEXITSTATUS(w) (w) + #define WIFEXITED(w) (true) + #define WIFSIGNALED(w) (false) + #define WTERMSIG(w) (0) +#endif + void genbitmaps_option(char opt, char *optarg) { @@ -498,7 +505,9 @@ BITMAP_EXIT_FAILURE; } +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, bitmaps_broken_pipe); +#endif if ((tfp = popen(com, "w")) == NULL) { fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); fprintf(stderr, "command was: %s\n", com); @@ -542,8 +551,9 @@ else status = -1; tfp = NULL; /* Otherwise main() tries to close tfp again */ +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, SIG_DFL); - +#endif if (status != 0) { FILE *f; diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8b/fig2dev/dev/genpdf.c --- fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c 2021-09-06 12:57:54.174751090 -0400 +++ fig2dev-3.2.8b/fig2dev/dev/genpdf.c 2021-09-06 13:00:15.862053203 -0400 @@ -111,7 +111,9 @@ exit(EXIT_FAILURE); } +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, pdf_broken_pipe); +#endif if ((tfp = popen(com, "w")) == 0) { err_msg("fig2dev: Cannot open pipe to ghostscript"); put_msg("Command was: %s", com); @@ -145,7 +147,9 @@ err_msg("Error in ghostcript command,\n %s", com); status = -1; } else { +#if !defined (__WIN32__) || defined (__CYGWIN__) (void)signal(SIGPIPE, SIG_DFL); +#endif } if (com != com_buf) diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c fig2dev-3.2.8b/fig2dev/dev/readeps.c --- fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c 2021-09-06 12:57:54.173751032 -0400 +++ fig2dev-3.2.8b/fig2dev/dev/readeps.c 2021-09-06 13:13:39.700059768 -0400 @@ -35,6 +35,13 @@ #include "messages.h" #include "readpics.h" +#if defined (__WIN32__) || !defined (__CYGWIN__) + #define WEXITSTATUS(w) (w) + #define WIFEXITED(w) (true) + #define WIFSIGNALED(w) (false) + #define WTERMSIG(w) (0) +#endif + int read_eps(F_pic *pic, struct xfig_stream *restrict pic_stream, int *llx, int *lly); diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c fig2dev-3.2.8b/fig2dev/dev/readpics.c --- fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c 2021-09-06 12:57:54.173751032 -0400 +++ fig2dev-3.2.8b/fig2dev/dev/readpics.c 2021-09-06 13:11:49.848636802 -0400 @@ -36,6 +36,15 @@ #include "xtmpfile.h" +#if defined (__WIN32__) || !defined (__CYGWIN__) + #define WEXITSTATUS(w) (w) + #define WIFEXITED(w) (true) + #define WIFSIGNALED(w) (false) + #define WTERMSIG(w) (0) +#endif + + + void init_stream(struct xfig_stream *restrict xf_stream) { diff -ur fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.9/fig2dev/dev/genbitmaps.c --- fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c 2023-08-28 14:23:23.409382069 -0400 +++ fig2dev-3.2.9/fig2dev/dev/genbitmaps.c 2023-08-28 14:28:00.897893044 -0400 @@ -36,7 +36,9 @@ #include <stdlib.h> #include <string.h> #include <signal.h> +#if ! defined (__WIN32__) || defined (__CYGWIN__) #include <sys/wait.h> +#endif #include "bool.h" #include "fig2dev.h" /* includes bool.h and object.h */ diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readeps.c fig2dev-3.2.9/fig2dev/dev/readeps.c --- fig2dev-3.2.9.orig/fig2dev/dev/readeps.c 2023-08-28 14:29:52.787550642 -0400 +++ fig2dev-3.2.9/fig2dev/dev/readeps.c 2023-08-28 14:30:41.593454664 -0400 @@ -29,7 +29,9 @@ #include <stdlib.h> #include <string.h> #include <math.h> +#if !defined (__WIN32__) || defined (__CYGWIN__) #include <sys/wait.h> +#endif #include "fig2dev.h" /* includes bool.h and object.h */ //#include "object.h" diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readpics.c fig2dev-3.2.9/fig2dev/dev/readpics.c --- fig2dev-3.2.9.orig/fig2dev/dev/readpics.c 2023-08-28 14:31:39.776916666 -0400 +++ fig2dev-3.2.9/fig2dev/dev/readpics.c 2023-08-28 14:32:25.565641164 -0400 @@ -31,7 +31,9 @@ #include <string.h> #include <unistd.h> #include <sys/stat.h> +#if !defined (__WIN32__) || defined (__CYGWIN__) #include <sys/wait.h> +#endif #include "messages.h" #include "xtmpfile.h"