This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Patch: FYI: Import AWT peers
- From: Mark Wielaard <mark at klomp dot org>
- To: tromey at redhat dot com
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>, gcc-patches at gcc dot gnu dot org
- Date: 01 Feb 2003 01:25:29 +0100
- Subject: Re: Patch: FYI: Import AWT peers
- Organization:
- References: <87u1fp1al3.fsf@fleche.redhat.com> <1044047121.758.14.camel@elsschot> <87k7glx9ot.fsf@fleche.redhat.com>
Hi,
On Fri, 2003-01-31 at 22:59, Tom Tromey wrote:
> >>>>> "Mark" == Mark Wielaard <mark@klomp.org> writes:
>
> Mark> - current = ALLOC (length);
> Mark> + current = ALLOC (length+1);
>
> You need spaces around the `+', but otherwise this is "obviously
> correct". Please check it in on the trunk and the 3.3 branch.
> Thanks!
OK, I will commit the following:
2003-01-31 Mark Wielaard <mark@klomp.org>
* gjavah.c (throwable_p): Allocate 1 more byte for string.
> Mark> - @input=`echo $@ | sed -e 's,jniinclude,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
> Mark> + @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
>
> Yes, please check this in. Thanks.
Will do as follows:
2003-01-31 Mark WIelaard <mark@klomp.org>
* Makefile.in: Rebuilt.
* Makefile.am (gtk_c_headers): Strip trailing / from jniinclude.
Cheers,
Mark
Index: gjavah.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/gjavah.c,v
retrieving revision 1.103
diff -u -r1.103 gjavah.c
--- gjavah.c 12 Jan 2003 02:14:55 -0000 1.103
+++ gjavah.c 31 Jan 2003 23:52:01 -0000
@@ -1119,7 +1119,7 @@
for (length = 0; clname[length] != ';' && clname[length] != '\0'; ++length)
;
- current = ALLOC (length);
+ current = ALLOC (length + 1);
for (i = 0; i < length; ++i)
current[i] = clname[i] == '/' ? '.' : clname[i];
current[length] = '\0';
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.272
diff -u -r1.272 Makefile.am
--- Makefile.am 31 Jan 2003 21:47:16 -0000 1.272
+++ Makefile.am 1 Feb 2003 00:19:48 -0000
@@ -231,7 +231,7 @@
$(gtk_c_headers): $(gtk_awt_peer_sources)
## FIXME: GNU make.
- @input=`echo $@ | sed -e 's,jniinclude,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
+ @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.292
diff -u -r1.292 Makefile.in
--- Makefile.in 31 Jan 2003 21:47:16 -0000 1.292
+++ Makefile.in 1 Feb 2003 00:19:51 -0000
@@ -2529,7 +2529,7 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
@@ -4534,7 +4534,7 @@
$(gtk_c_headers): $(gtk_awt_peer_sources)
- @input=`echo $@ | sed -e 's,jniinclude,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
+ @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input