Use <sys/wait.h> if available.

Provide centralized fall-back of WEXITSTATUS if <sys/wait.h> does not supply it.

Author: broeker

ChangeLog

@@ -1,3 +1,14 @@
+2017-10-06  Hans-Bernhard Broeker  <[email protected]>
+
+	* src/command.c: Move WEXITSTATUS fall-back definition away from here.
+
+	* src/syscfg.h: Include <sys/wait.h>, if it exists.
+	(WEXITSTATUS): Provide fall-back definition, if none in
+	<sys/wait.h>.  Move MS Windows specific replacement from command.c
+	to here.
+
+	* configure.ac: Add call to AC_HEADER_SYS_WAIT
+
 2017-10-06  Bastian Maerkisch  <[email protected]>
 
 	* config/mingw/Makefile:  Add helpfiles to "all" target, including
@@ -38,8 +49,8 @@
 
 2017-09-29  Ethan A Merritt  <[email protected]>
 
-	* src/axis.h src/axis.c (axis_set_scale_and_range):  Incorrect use
-	of unsigned parameters caused terminal scaling to fail if the axis 
+	* src/axis.h src/axis.c (axis_set_scale_and_range): Incorrect use
+	of unsigned parameters caused terminal scaling to fail if the axis
 	range was inverted. The error was introduced by converting from a
 	macro to a subroutine in the run-up to 5.2.
 

configure.ac

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl configure.in for gnuplot on Unix.
 dnl
-dnl $Id: configure.ac,v 1.39 2017-09-04 23:25:00 sfeam Exp $
+dnl $Id: configure.ac,v 1.40 2017-10-06 18:35:09 broeker Exp $
 dnl
 dnl this is actually major.minor ...
 dnl note that for a non-beta release, we need to disable DEVELOPMENT_RELEASE
@@ -228,6 +228,8 @@ if test "$ac_cv_header_sys_stat_h" = yes; then
   AC_HEADER_STAT
 fi
 
+AC_HEADER_SYS_WAIT
+
 dnl Check for external functions plugin infrastructure
 AC_ARG_ENABLE(plugins,dnl
 [  --disable-plugins       disable support for importing external functions],,)

src/command.c

@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid() { return RCSid("$Id: command.c,v 1.364 2017-10-01 09:01:57 markisch Exp $"); }
+static char *RCSid() { return RCSid("$Id: command.c,v 1.365 2017-10-06 18:35:09 broeker Exp $"); }
 #endif
 
 /* GNUPLOT - command.c */
@@ -3621,10 +3621,6 @@ do_system_func(const char *cmd, char **output)
 
 }
 
-#if defined(_WIN32) && !defined(WEXITSTATUS)
-#define WEXITSTATUS(error) (error)
-#endif
-
 static int
 report_error(int ierr)
 {

src/syscfg.h

@@ -1,5 +1,5 @@
 /*
- * $Id: syscfg.h,v 1.65 2017-07-29 08:35:44 markisch Exp $
+ * $Id: syscfg.h,v 1.66 2017-10-06 18:35:09 broeker Exp $
  */
 
 /* GNUPLOT - syscfg.h */
@@ -257,11 +257,23 @@ FILE * win_popen(const char *filename, const char *mode);
 #define GPHUGE /* nothing */
 #define GPFAR /* nothing */
 
+#if defined(HAVE_SYS_TYPES_H)
+# include <sys/types.h>
+# if defined(HAVE_SYS_WAIT_H)
+#  include <sys/wait.h>
+# endif
+#endif
+
+#if !defined(WEXITSTATUS)
+# if defined(_WIN32)
+#  define WEXITSTATUS(stat_val) (stat_val)
+# else
+#  define WEXITSTATUS(stat_val) ((unsigned int)(stat_val) >> 8)
+# endif
+#endif
+
 /* LFS support */
 #if !defined(HAVE_FSEEKO) || !defined(HAVE_OFF_T)
-# if defined(HAVE_SYS_TYPES_H)
-#   include <sys/types.h>
-# endif
 # if defined(_MSC_VER)
 #   define off_t __int64
 # elif defined(__MINGW32__)