Release 10.35.08

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@90 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/libppmd.c b/lib/libppmd.c
index 6c764ca1..ac8b6dee 100644
--- a/lib/libppmd.c
+++ b/lib/libppmd.c
@@ -18,15 +18,13 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include "pm_config.h"
 #include "pm_c_util.h"
 #include "mallocvar.h"
 #include "ppm.h"
 #include "ppmdfont.h"
 #include "ppmdraw.h"
 
-typedef int qsort_compare(const void *, const void *);
-    /* A compare function to pass to stdlib.h's qsort() */
-
 
 #define DDA_SCALE 8192
 
@@ -779,7 +777,9 @@ ppmd_fill_drawproc(pixel**      const pixels,
 
 
 
-static qsort_compare yx_compare;
+#ifndef LITERAL_FN_DEF_MATCH
+static qsort_comparison_fn yx_compare;
+#endif
 
 static int
 yx_compare(const void * const c1Arg,
diff --git a/lib/libsystem.c b/lib/libsystem.c
index e0d62178..560f0a9c 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -242,6 +242,10 @@ pm_system(void stdinFeeder(int, void *),
         spawnProcessor(shellCommand, shellStdinFd, 
                        &shellStdoutFd, &processorPid);
 
+        /* The shell process has cloned our 'shellStdinFd'; we have no
+           more use for our copy.
+        */
+        close(shellStdinFd);
         /* Dispose of the stdout from that shell */
         (*stdoutAccepter)(shellStdoutFd, accepterParm);
         close(shellStdoutFd);