[kaffe] CVS kaffe (robilad): include/jawt.h, include/jawt_md.h:

Kaffe CVS cvs-commits at kaffe.org
Mon Oct 1 06:08:52 PDT 2007


PatchSet 7572 
Date: 2007/10/01 13:07:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-10-01  Dalibor Topic  <robilad at kaffe.org>

        * include/jawt.h, include/jawt_md.h:
        Removed unused files.

        * include/Makefile.am (include_HEADERS): Removed JAWT_HDRS.

Members: 
	ChangeLog:1.5069->1.5070 
	include/Makefile.am:1.136->1.137 
	include/Makefile.in:1.300->1.301 
	include/jawt.h:1.3->1.4(DEAD) 
	include/jawt_md.h:1.3->1.4(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5069 kaffe/ChangeLog:1.5070
--- kaffe/ChangeLog:1.5069	Mon Oct  1 12:27:24 2007
+++ kaffe/ChangeLog	Mon Oct  1 13:07:32 2007
@@ -1,5 +1,12 @@
 2007-10-01  Dalibor Topic  <robilad at kaffe.org>
 
+	* include/jawt.h, include/jawt_md.h:
+	Removed unused files.
+
+	* include/Makefile.am (include_HEADERS): Removed JAWT_HDRS.
+
+2007-10-01  Dalibor Topic  <robilad at kaffe.org>
+
 	* Makefile.am (EXTRA_DIST): Added drops patches for config.guess.
 
 2007-10-01  Dalibor Topic  <robilad at kaffe.org>
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.136 kaffe/include/Makefile.am:1.137
--- kaffe/include/Makefile.am:1.136	Tue Nov  7 03:37:33 2006
+++ kaffe/include/Makefile.am	Mon Oct  1 13:07:33 2007
@@ -186,8 +186,7 @@
 	jni_md.h \
 	jni_cpp.h \
 	jvmpi.h \
-	kaffe_jni.h \
-	$(JAWT_HDRS)
+	kaffe_jni.h
 
 nodist_pkginclude_HEADERS = \
 	$(INSTALL_DERIVED_HDRS) \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.300 kaffe/include/Makefile.in:1.301
--- kaffe/include/Makefile.in:1.300	Tue Aug  7 01:44:48 2007
+++ kaffe/include/Makefile.in	Mon Oct  1 13:07:33 2007
@@ -457,8 +457,7 @@
 	jni_md.h \
 	jni_cpp.h \
 	jvmpi.h \
-	kaffe_jni.h \
-	$(JAWT_HDRS)
+	kaffe_jni.h
 
 nodist_pkginclude_HEADERS = \
 	$(INSTALL_DERIVED_HDRS) \
===================================================================
Checking out kaffe/include/jawt.h
RCS:  /home/cvs/kaffe/kaffe/include/Attic/jawt.h,v
VERS: 1.3
***************
--- kaffe/include/jawt.h	Mon Oct  1 13:08:51 2007
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,108 +0,0 @@
-/* jawt.h -- the machine-independent parts of the AWT Native Interface
-   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 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. */
-
-
-/*
- * The AWT Native Interface allows direct access to native screen
- * resources from within a Canvas's paint method.
- */
-
-#ifndef __jawt_h__
-#define __jawt_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define JAWT_VERSION_1_3 0x10003
-#define JAWT_VERSION_1_4 0x10004
-
-#define JAWT_LOCK_ERROR 0x1
-#define JAWT_LOCK_CLIP_CHANGED 0x2
-#define JAWT_LOCK_BOUNDS_CHANGED 0x4
-#define JAWT_LOCK_SURFACE_CHANGED 0x8
-
-struct _JAWT_Rectangle
-{
-  jint x;
-  jint y;
-  jint width;
-  jint height;
-};
-
-struct _JAWT_DrawingSurfaceInfo
-{
-  void* platformInfo;
-  struct _JAWT_DrawingSurface *ds;
-  struct _JAWT_Rectangle bounds;
-  jint clipSize;
-  struct _JAWT_Rectangle *clip;
-};
-
-struct _JAWT_DrawingSurface
-{
-  JNIEnv* env;
-  jobject target;
-  jint (JNICALL* Lock) (struct _JAWT_DrawingSurface*);
-  struct _JAWT_DrawingSurfaceInfo* (JNICALL* GetDrawingSurfaceInfo) (struct _JAWT_DrawingSurface*);
-  void (JNICALL* FreeDrawingSurfaceInfo) (struct _JAWT_DrawingSurfaceInfo*);
-  void (JNICALL* Unlock) (struct _JAWT_DrawingSurface*);
-};
-
-struct _JAWT
-{
-  jint version;
-  struct _JAWT_DrawingSurface* (JNICALL* GetDrawingSurface) (JNIEnv*, jobject);
-  void (JNICALL* FreeDrawingSurface) (struct _JAWT_DrawingSurface*);
-  void (JNICALL *Lock) (JNIEnv*);
-  void (JNICALL *Unlock) (JNIEnv*);
-  jobject (JNICALL *GetComponent)(JNIEnv*, void*);
-};
-
-typedef struct _JAWT_Rectangle JAWT_Rectangle;
-typedef struct _JAWT_DrawingSurfaceInfo JAWT_DrawingSurfaceInfo;
-typedef struct _JAWT_DrawingSurface JAWT_DrawingSurface;
-typedef struct _JAWT JAWT;
-
-JNIEXPORT jboolean JNICALL JAWT_GetAWT (JNIEnv* env, struct _JAWT* awt);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __jawt_h__ */
===================================================================
Checking out kaffe/include/jawt_md.h
RCS:  /home/cvs/kaffe/kaffe/include/Attic/jawt_md.h,v
VERS: 1.3
***************
--- kaffe/include/jawt_md.h	Mon Oct  1 13:08:52 2007
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,67 +0,0 @@
-/* jawt_md.h -- the X11-dependent parts of the AWT Native Interface
-   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 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. */
-
-
-#ifndef __jawt_md_h__
-#define __jawt_md_h__
-
-#include <jni.h>
-#include <jawt.h>
-#include <X11/Xlib.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-struct _JAWT_X11DrawingSurfaceInfo
-{
-  Drawable drawable;
-  Display* display;
-  VisualID visualID;
-  Colormap colormapID;
-  int depth;
-  int (JNICALL *GetAWTColor)(struct _JAWT_DrawingSurface*, int, int, int);
-};
-
-typedef struct _JAWT_X11DrawingSurfaceInfo JAWT_X11DrawingSurfaceInfo;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __jawt_md_h__ */




More information about the kaffe mailing list