Patchwork Fix libjava bootstrap failure around IUCLC

login
register
mail settings
Submitter Gerald Pfeifer
Date March 25, 2012, 4:08 p.m.
Message ID <alpine.LNX.2.00.1203251807180.4039@gerinyyl.fvgr>
Download mbox | patch
Permalink /patch/148568/
State New
Headers show

Comments

Gerald Pfeifer - March 25, 2012, 4:08 p.m.
This has been introduced by

  2012-03-16  Andrew John Hughes  <ahughes@redhat.com>

        * Makefile.am: Add natVMConsole.cc.
	:
        * java/io/VMConsole.h: Initial generation.
        * java/io/VMConsole.java: Copied from classpath/vm/reference.
        * java/io/natVMConsole.cc: Implemented readPassword.

where now bootstrap on FreeBSD, Darwin and possibly others is broken.

Tested on amd64-unknown-freebsd8.3.  Okay?

Gerald


2012-03-25  Gerald Pfeifer  <gerald@pfeifer.com>

        PR libgcj/52694
        * java/io/natVMConsole.cc (IUCLC): Define, if undefined.

Patch

Index: java/io/natVMConsole.cc
===================================================================
--- java/io/natVMConsole.cc	(revision 185766)
+++ java/io/natVMConsole.cc	(working copy)
@@ -19,6 +19,10 @@ 
 #include <java/io/Console.h>
 #include <java/io/VMConsole.h>
 
+#ifndef IUCLC
+#define IUCLC 0
+#endif
+
 #define TERMIOS_ECHO_IFLAGS (IUCLC|IXON|IXOFF|IXANY)
 #define TERMIOS_ECHO_LFLAGS (ECHO|ECHOE|ECHOK|ECHONL|TOSTOP)