FYI: Header files cleanup

[Mark Wielaard]

Hi,

Michael Koch pointed out that I had forgotten to regenerate the header
files while I updated the gtk-peer sources. While checking we found that
also gnu.java.nio_FileLockImpl had been rewritten and no headers were
updated. The following patch fixes all.

 2004-04-18  Mark Wielaard  <address@hidden>
  
       * include/Makefile.am: Remove java_nio_FileLockImpl.h generation.
       * include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Regenerate.
       * include/gnu_java_awt_peer_gtk_GtkPanelPeer.h: Regenerate.
       * include/gnu_java_nio_FileLockImpl.h: Removed.
       * native/jni/java-nio/Makefile.am (libjavanio_la_SOURCES): Removed
       java_nio_FileLockImpl.c.
       * native/jni/java-nio/java_nio_FileLockImpl.c: Removed.

Cheers,

Mark

Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- include/Makefile.am 12 Apr 2004 12:45:05 -0000      1.14
+++ include/Makefile.am 18 Apr 2004 15:37:39 -0000
@@ -55,7 +55,6 @@
 $(top_srcdir)/include/java_net_InetAddress.h \
 $(top_srcdir)/include/java_net_NetworkInterface.h \
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \
-$(top_srcdir)/include/gnu_java_nio_FileLockImpl.h \
 $(top_srcdir)/include/java_util_TimeZone.h
 
 if CREATE_JNI_HEADERS
@@ -166,8 +165,6 @@
        $(JAVAH) -o $@ java.nio.DirectByteBufferImpl
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: 
$(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java
        $(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl
-$(top_srcdir)/include/gnu_java_nio_FileLockImpl.h: 
$(top_srcdir)/gnu/java/nio/FileLockImpl.java
-       $(JAVAH) -o $@ gnu.java.nio.FileLockImpl
 $(top_srcdir)/include/java_util_TimeZone.h: 
$(top_srcdir)/java/util/TimeZone.java
        $(JAVAH) -o $@ java.util.TimeZone
 
Index: include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     8 Oct 2003 16:00:56 
-0000       1.3
+++ include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     18 Apr 2004 15:37:39 
-0000
@@ -11,6 +11,7 @@
 #endif
 
 extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create (JNIEnv *env, jobject, 
jstring);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals (JNIEnv *env, 
jobject);
 extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel (JNIEnv *env, jobject, 
jstring);
 
 #ifdef __cplusplus
Index: include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkPanelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkPanelPeer.h        7 Jan 2004 02:23:37 
-0000       1.3
+++ include/gnu_java_awt_peer_gtk_GtkPanelPeer.h        18 Apr 2004 15:37:39 
-0000
@@ -12,7 +12,6 @@
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create 
(JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_nio_FileLockImpl.h
===================================================================
RCS file: include/gnu_java_nio_FileLockImpl.h
diff -N include/gnu_java_nio_FileLockImpl.h
--- include/gnu_java_nio_FileLockImpl.h 2 Jul 2003 09:16:52 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_nio_FileLockImpl__
-#define __gnu_java_nio_FileLockImpl__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_FileLockImpl_releaseImpl 
(JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gnu_java_nio_FileLockImpl__ */
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- native/jni/java-nio/Makefile.am     12 Apr 2004 10:43:41 -0000      1.5
+++ native/jni/java-nio/Makefile.am     18 Apr 2004 15:37:40 -0000
@@ -4,8 +4,7 @@
                        gnu_java_nio_PipeImpl.c \
                        gnu_java_nio_SelectorImpl.c \
                        gnu_java_nio_channels_FileChannelImpl.c \
-                       java_nio_DirectByteBufferImpl.c \
-                       java_nio_FileLockImpl.c
+                       java_nio_DirectByteBufferImpl.c
 
 libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
Index: native/jni/java-nio/java_nio_FileLockImpl.c
===================================================================
RCS file: native/jni/java-nio/java_nio_FileLockImpl.c
diff -N native/jni/java-nio/java_nio_FileLockImpl.c
--- native/jni/java-nio/java_nio_FileLockImpl.c 29 Mar 2004 07:07:39 -0000      
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-/* NetworkInterface.c - Native methods for NetworkInterface class
-   Copyright (C) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-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.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-#include <config.h>
-#include <errno.h>
-
-#include <jni.h>
-#include <jcl.h>
-
-#include "gnu_java_nio_FileLockImpl.h"
-
-#define IO_EXCEPTION "java/io/IOException"
-
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_FileLockImpl_releaseImpl (JNIEnv *env, jclass class)
-{
-  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.(): not 
implemented");
-}
-

signature.asc
Description: This is a digitally signed message part