projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid some autoconf warnings.
[gnulib.git]
/
lib
/
javacomp.c
diff --git
a/lib/javacomp.c
b/lib/javacomp.c
index
37d72c2
..
a05267a
100644
(file)
--- a/
lib/javacomp.c
+++ b/
lib/javacomp.c
@@
-2,10
+2,10
@@
Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <alloca.h>
#include <config.h>
#include <alloca.h>
@@
-41,9
+40,8
@@
#include "binary-io.h"
#include "safe-read.h"
#include "xalloc.h"
#include "binary-io.h"
#include "safe-read.h"
#include "xalloc.h"
-#include "xallocsa.h"
-#include "getline.h"
-#include "pathname.h"
+#include "xmalloca.h"
+#include "filename.h"
#include "fwriteerror.h"
#include "clean-temp.h"
#include "error.h"
#include "fwriteerror.h"
#include "clean-temp.h"
#include "error.h"
@@
-230,7
+228,7
@@
compile_using_envjavac (const char *javac,
command_length += 1 + shell_quote_length (java_sources[i]);
command_length += 1;
command_length += 1 + shell_quote_length (java_sources[i]);
command_length += 1;
- command = (char *) x
allocs
a (command_length);
+ command = (char *) x
malloc
a (command_length);
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
@@
-273,7
+271,7
@@
compile_using_envjavac (const char *javac,
null_stderr, true, true);
err = (exitstatus != 0);
null_stderr, true, true);
err = (exitstatus != 0);
- free
s
a (command);
+ freea (command);
return err;
}
return err;
}
@@
-303,7
+301,7
@@
compile_using_gcj (const char * const *java_sources,
2 + (no_assert_option ? 1 : 0) + (fsource_option ? 1 : 0)
+ (ftarget_option ? 1 : 0) + (optimize ? 1 : 0) + (debug ? 1 : 0)
+ (directory != NULL ? 2 : 0) + java_sources_count;
2 + (no_assert_option ? 1 : 0) + (fsource_option ? 1 : 0)
+ (ftarget_option ? 1 : 0) + (optimize ? 1 : 0) + (debug ? 1 : 0)
+ (directory != NULL ? 2 : 0) + java_sources_count;
- argv = (char **) x
allocs
a ((argc + 1) * sizeof (char *));
+ argv = (char **) x
malloc
a ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "gcj";
argp = argv;
*argp++ = "gcj";
@@
-312,7
+310,7
@@
compile_using_gcj (const char * const *java_sources,
*argp++ = "-fno-assert";
if (fsource_option)
{
*argp++ = "-fno-assert";
if (fsource_option)
{
- fsource_arg = (char *) x
allocs
a (9 + strlen (source_version) + 1);
+ fsource_arg = (char *) x
malloc
a (9 + strlen (source_version) + 1);
memcpy (fsource_arg, "-fsource=", 9);
strcpy (fsource_arg + 9, source_version);
*argp++ = fsource_arg;
memcpy (fsource_arg, "-fsource=", 9);
strcpy (fsource_arg + 9, source_version);
*argp++ = fsource_arg;
@@
-321,7
+319,7
@@
compile_using_gcj (const char * const *java_sources,
fsource_arg = NULL;
if (ftarget_option)
{
fsource_arg = NULL;
if (ftarget_option)
{
- ftarget_arg = (char *) x
allocs
a (9 + strlen (target_version) + 1);
+ ftarget_arg = (char *) x
malloc
a (9 + strlen (target_version) + 1);
memcpy (ftarget_arg, "-ftarget=", 9);
strcpy (ftarget_arg + 9, target_version);
*argp++ = ftarget_arg;
memcpy (ftarget_arg, "-ftarget=", 9);
strcpy (ftarget_arg + 9, target_version);
*argp++ = ftarget_arg;
@@
-356,10
+354,10
@@
compile_using_gcj (const char * const *java_sources,
err = (exitstatus != 0);
if (ftarget_arg != NULL)
err = (exitstatus != 0);
if (ftarget_arg != NULL)
- free
s
a (ftarget_arg);
+ freea (ftarget_arg);
if (fsource_arg != NULL)
if (fsource_arg != NULL)
- free
s
a (fsource_arg);
- free
s
a (argv);
+ freea (fsource_arg);
+ freea (argv);
return err;
}
return err;
}
@@
-385,7
+383,7
@@
compile_using_javac (const char * const *java_sources,
argc =
1 + (source_option ? 2 : 0) + (target_option ? 2 : 0) + (optimize ? 1 : 0)
+ (debug ? 1 : 0) + (directory != NULL ? 2 : 0) + java_sources_count;
argc =
1 + (source_option ? 2 : 0) + (target_option ? 2 : 0) + (optimize ? 1 : 0)
+ (debug ? 1 : 0) + (directory != NULL ? 2 : 0) + java_sources_count;
- argv = (char **) x
allocs
a ((argc + 1) * sizeof (char *));
+ argv = (char **) x
malloc
a ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "javac";
argp = argv;
*argp++ = "javac";
@@
-426,7
+424,7
@@
compile_using_javac (const char * const *java_sources,
null_stderr, true, true);
err = (exitstatus != 0);
null_stderr, true, true);
err = (exitstatus != 0);
- free
s
a (argv);
+ freea (argv);
return err;
}
return err;
}
@@
-450,7
+448,7
@@
compile_using_jikes (const char * const *java_sources,
argc =
1 + (optimize ? 1 : 0) + (debug ? 1 : 0) + (directory != NULL ? 2 : 0)
+ java_sources_count;
argc =
1 + (optimize ? 1 : 0) + (debug ? 1 : 0) + (directory != NULL ? 2 : 0)
+ java_sources_count;
- argv = (char **) x
allocs
a ((argc + 1) * sizeof (char *));
+ argv = (char **) x
malloc
a ((argc + 1) * sizeof (char *));
argp = argv;
*argp++ = "jikes";
argp = argv;
*argp++ = "jikes";
@@
-481,7
+479,7
@@
compile_using_jikes (const char * const *java_sources,
null_stderr, true, true);
err = (exitstatus != 0);
null_stderr, true, true);
err = (exitstatus != 0);
- free
s
a (argv);
+ freea (argv);
return err;
}
return err;
}
@@
-566,7
+564,7
@@
is_envjavac_gcj (const char *javac)
/* Setup the command "$JAVAC --version". */
command_length = strlen (javac) + 1 + 9 + 1;
/* Setup the command "$JAVAC --version". */
command_length = strlen (javac) + 1 + 9 + 1;
- command = (char *) x
allocs
a (command_length);
+ command = (char *) x
malloc
a (command_length);
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
@@
-612,7
+610,7
@@
is_envjavac_gcj (const char *javac)
envjavac_gcj = false;
failed:
envjavac_gcj = false;
failed:
- free
s
a (command);
+ freea (command);
envjavac_tested = true;
}
envjavac_tested = true;
}
@@
-647,7
+645,7
@@
is_envjavac_gcj43 (const char *javac)
/* Setup the command "$JAVAC --version". */
command_length = strlen (javac) + 1 + 9 + 1;
/* Setup the command "$JAVAC --version". */
command_length = strlen (javac) + 1 + 9 + 1;
- command = (char *) x
allocs
a (command_length);
+ command = (char *) x
malloc
a (command_length);
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
p = command;
/* Don't shell_quote $JAVAC, because it may consist of a command
and options. */
@@
-696,7
+694,7
@@
is_envjavac_gcj43 (const char *javac)
envjavac_gcj43 = false;
failed:
envjavac_gcj43 = false;
failed:
- free
s
a (command);
+ freea (command);
envjavac_tested = true;
}
envjavac_tested = true;
}
@@
-741,7
+739,7
@@
is_envjavac_gcj43_usable (const char *javac,
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
@@
-751,7
+749,7
@@
is_envjavac_gcj43_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-785,7
+783,7
@@
is_envjavac_gcj43_usable (const char *javac,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@
-797,7
+795,7
@@
is_envjavac_gcj43_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-890,7
+888,7
@@
is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep)
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
@@
-900,7
+898,7
@@
is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep)
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-927,7
+925,7
@@
is_envjavac_oldgcj_14_14_usable (const char *javac, bool *usablep)
Return a failure indicator (true upon error). */
static bool
is_envjavac_oldgcj_14_13_usable (const char *javac,
Return a failure indicator (true upon error). */
static bool
is_envjavac_oldgcj_14_13_usable (const char *javac,
- bool *usablep, bool *need_no_assert_option_p)
+
bool *usablep, bool *need_no_assert_option_p)
{
static bool envjavac_tested;
static bool envjavac_usable;
{
static bool envjavac_tested;
static bool envjavac_usable;
@@
-951,7
+949,7
@@
is_envjavac_oldgcj_14_13_usable (const char *javac,
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
@@
-961,7
+959,7
@@
is_envjavac_oldgcj_14_13_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-994,7
+992,7
@@
is_envjavac_oldgcj_14_13_usable (const char *javac,
if (javac_works && javac_noassert_works)
{
conftest_file_name =
if (javac_works && javac_noassert_works)
{
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftestfail.java",
+ concatenated_
file
name (tmpdir->dir_name, "conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_failcode_snippet ("1.3")))
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_failcode_snippet ("1.3")))
@@
-1006,7
+1004,7
@@
is_envjavac_oldgcj_14_13_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftestfail.class",
+ concatenated_
file
name (tmpdir->dir_name, "conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1091,7
+1089,7
@@
is_envjavac_nongcj_usable (const char *javac,
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
@@
-1101,7
+1099,7
@@
is_envjavac_nongcj_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-1135,7
+1133,7
@@
is_envjavac_nongcj_usable (const char *javac,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@
-1147,7
+1145,7
@@
is_envjavac_nongcj_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1219,7
+1217,7
@@
is_envjavac_nongcj_usable (const char *javac,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
@@
-1233,7
+1231,7
@@
is_envjavac_nongcj_usable (const char *javac,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1387,7
+1385,7
@@
is_gcj_present (void)
char *conftest_file_name;
conftest_file_name =
char *conftest_file_name;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftestlib.java",
+ concatenated_
file
name (tmpdir->dir_name, "conftestlib.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"public class conftestlib {\n"
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"public class conftestlib {\n"
@@
-1401,7
+1399,7
@@
is_gcj_present (void)
const char *java_sources[1];
compiled_file_name =
const char *java_sources[1];
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestlib.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestlib.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1531,7
+1529,7
@@
is_gcj43_usable (const char *source_version,
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
@@
-1541,7
+1539,7
@@
is_gcj43_usable (const char *source_version,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-1571,7
+1569,7
@@
is_gcj43_usable (const char *source_version,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@
-1582,7
+1580,7
@@
is_gcj43_usable (const char *source_version,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1670,7
+1668,7
@@
is_oldgcj_14_14_usable (bool *usablep)
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.4")))
{
@@
-1680,7
+1678,7
@@
is_oldgcj_14_14_usable (bool *usablep)
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-1727,7
+1725,7
@@
is_oldgcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet ("1.3")))
{
@@
-1737,7
+1735,7
@@
is_oldgcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-1835,7
+1833,7
@@
is_javac_usable (const char *source_version, const char *target_version,
return true;
conftest_file_name =
return true;
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.java", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.java", NULL);
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
if (write_temp_file (tmpdir, conftest_file_name,
get_goodcode_snippet (source_version)))
{
@@
-1845,7
+1843,7
@@
is_javac_usable (const char *source_version, const char *target_version,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name, "conftest.class", NULL);
+ concatenated_
file
name (tmpdir->dir_name, "conftest.class", NULL);
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
register_temp_file (tmpdir, compiled_file_name);
java_sources[0] = conftest_file_name;
@@
-1878,7
+1876,7
@@
is_javac_usable (const char *source_version, const char *target_version,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name, failcode))
@@
-1889,7
+1887,7
@@
is_javac_usable (const char *source_version, const char *target_version,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
@@
-1959,7
+1957,7
@@
is_javac_usable (const char *source_version, const char *target_version,
free (conftest_file_name);
conftest_file_name =
free (conftest_file_name);
conftest_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
"conftestfail.java",
NULL);
if (write_temp_file (tmpdir, conftest_file_name,
@@
-1971,7
+1969,7
@@
is_javac_usable (const char *source_version, const char *target_version,
}
compiled_file_name =
}
compiled_file_name =
- concatenated_
path
name (tmpdir->dir_name,
+ concatenated_
file
name (tmpdir->dir_name,
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);
"conftestfail.class",
NULL);
register_temp_file (tmpdir, compiled_file_name);