diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 54681c5c5bce51bda6d963af6cb6d9b7a25f3ef6..1c11d968637d18e9f6d13a6c430c8b4a439b213c 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 30 20:53:51 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* jcf-write.c (OP2, OP4): Use "_i", not "_I" to avoid problems on
+	FreeBSD.
+
 Thu Sep 17 19:45:01 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* Makefile.in (jcf-dump, jvgenmain): Link in memmove.o too.
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index b5bbdff0a83d06a7a5ca7737e0e7dd3220d390e4..af663017bfdfcfdc414d0edd3b57018e2f73deec 100644
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -52,13 +52,13 @@ struct buffer bytecode = NULL_BUFFER;
 /* Like OP1, but I is a 2-byte big endian integer. */
 
 #define OP2(I) \
-  do { int _I = (I);  OP1 (_I >> 8);  OP1 (_I); } while (0)
+  do { int _i = (I);  OP1 (_i >> 8);  OP1 (_i); } while (0)
 
 /* Like OP1, but I is a 4-byte big endian integer. */
 
 #define OP4(I) \
-  do { int _I = (I);  OP1 (_I >> 24);  OP1 (_I >> 16); \
-       OP1 (_I >> 8); OP1 (_I); } while (0)
+  do { int _i = (I);  OP1 (_i >> 24);  OP1 (_i >> 16); \
+       OP1 (_i >> 8); OP1 (_i); } while (0)
 
 /* The current stack size (stack pointer) in the current method. */