summaryrefslogtreecommitdiff
path: root/w32/subproc
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2010-07-19 07:10:53 +0000
committerPaul Smith <psmith@gnu.org>2010-07-19 07:10:53 +0000
commitfba20a776da6d4a36db21d9b21e9e937bef00ac3 (patch)
tree4cf2063962595ca40234d4832a00f7eeb7ebb321 /w32/subproc
parentdf2fa7c5a5726b4e0a50e0eff209a3518ab19603 (diff)
downloadgunmake-fba20a776da6d4a36db21d9b21e9e937bef00ac3.tar.gz
- Many fixup patches from Savannah.
- Fix the test suite on Solaris (from Boris) - Update the manual for .ONESHELL
Diffstat (limited to 'w32/subproc')
-rw-r--r--w32/subproc/misc.c3
-rw-r--r--w32/subproc/sub_proc.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/w32/subproc/misc.c b/w32/subproc/misc.c
index 298db48..6759c17 100644
--- a/w32/subproc/misc.c
+++ b/w32/subproc/misc.c
@@ -15,6 +15,7 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http://www.gnu.org/licenses/>. */
+#include <config.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -77,6 +78,6 @@ arr2envblk(char **arr, char **envblk_out)
arrcnt++;
}
- free(tmp);
+ free(tmp);
return TRUE;
}
diff --git a/w32/subproc/sub_proc.c b/w32/subproc/sub_proc.c
index f0597b0..dcb77bf 100644
--- a/w32/subproc/sub_proc.c
+++ b/w32/subproc/sub_proc.c
@@ -15,9 +15,14 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http://www.gnu.org/licenses/>. */
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
+#ifdef _MSC_VER
+# include <stddef.h> /* for intptr_t */
+#else
+# include <stdint.h>
+#endif
#include <process.h> /* for msvc _beginthreadex, _endthreadex */
#include <signal.h>
#include <windows.h>
@@ -25,7 +30,6 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sub_proc.h"
#include "proc.h"
#include "w32err.h"
-#include "config.h"
#include "debug.h"
static char *make_command_line(char *shell_name, char *exec_path, char **argv);