X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fjavaversion.c;h=2d5bf426cd3068010e6e370d3dc4718a68d5ded7;hb=10f2e326a345a8f342ddf10ceb29b5e143795de1;hp=003919e794bbf843099ab45aacd5364141ec42c1;hpb=f7bab1b29955f86484cb70871c7b88915542abeb;p=gnulib.git

diff --git a/lib/javaversion.c b/lib/javaversion.c
index 003919e79..2d5bf426c 100644
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -30,17 +30,17 @@
 # define relocate(pathname) (pathname)
 #endif
 
-/* Get PKGDATADIR.  */
-#include "configmake.h"
-
 #include "javaexec.h"
-#include "pipe.h"
+#include "spawn-pipe.h"
 #include "wait-process.h"
 #include "error.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
 
+/* Get PKGDATADIR.  */
+#include "configmake.h"
+
 
 struct locals
 {
@@ -50,8 +50,8 @@ struct locals
 
 static bool
 execute_and_read_line (const char *progname,
-		       const char *prog_path, char **prog_argv,
-		       void *private_data)
+                       const char *prog_path, char **prog_argv,
+                       void *private_data)
 {
   struct locals *l = (struct locals *) private_data;
   pid_t child;
@@ -64,7 +64,7 @@ execute_and_read_line (const char *progname,
 
   /* Open a pipe to the JVM.  */
   child = create_pipe_in (progname, prog_path, prog_argv, DEV_NULL, false,
-			  true, false, fd);
+                          true, false, fd);
 
   if (child == -1)
     return false;
@@ -113,7 +113,7 @@ javaexec_version (void)
   args[0] = NULL;
   locals.line = NULL;
   execute_java_class (class_name, &pkgdatadir, 1, true, NULL, args,
-		      false, false, execute_and_read_line, &locals);
+                      false, false, execute_and_read_line, &locals);
 
   return locals.line;
 }