projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfreopen: new module, from coreutils
[gnulib.git]
/
lib
/
javaversion.c
diff --git
a/lib/javaversion.c
b/lib/javaversion.c
index
4ce564b
..
94a353a
100644
(file)
--- a/
lib/javaversion.c
+++ b/
lib/javaversion.c
@@
-1,5
+1,5
@@
/* Determine the Java version supported by javaexec.
/* Determine the Java version supported by javaexec.
- Copyright (C) 2006
, 2007
Free Software Foundation, Inc.
+ Copyright (C) 2006
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software: you can redistribute it and/or modify
@@
-30,9
+30,6
@@
# define relocate(pathname) (pathname)
#endif
# define relocate(pathname) (pathname)
#endif
-/* Get PKGDATADIR. */
-#include "configmake.h"
-
#include "javaexec.h"
#include "pipe.h"
#include "wait-process.h"
#include "javaexec.h"
#include "pipe.h"
#include "wait-process.h"
@@
-41,6
+38,9
@@
#define _(str) gettext (str)
#define _(str) gettext (str)
+/* Get PKGDATADIR. */
+#include "configmake.h"
+
struct locals
{
struct locals
{
@@
-90,7
+90,8
@@
execute_and_read_line (const char *progname,
fclose (fp);
/* Remove zombie process from process list, and retrieve exit status. */
fclose (fp);
/* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, progname, true, false, true, false);
+ exitstatus =
+ wait_subprocess (child, progname, true, false, true, false, NULL);
if (exitstatus != 0)
{
free (line);
if (exitstatus != 0)
{
free (line);