diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/java/awt | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt')
| -rw-r--r-- | libjava/java/awt/Desktop.h | 2 | ||||
| -rw-r--r-- | libjava/java/awt/Font.h | 1 | ||||
| -rw-r--r-- | libjava/java/awt/LightweightDispatcher.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libjava/java/awt/Desktop.h b/libjava/java/awt/Desktop.h index 8b5927d88bc..b50a063ff4e 100644 --- a/libjava/java/awt/Desktop.h +++ b/libjava/java/awt/Desktop.h @@ -33,9 +33,7 @@ class java::awt::Desktop : public ::java::lang::Object Desktop(); public: static ::java::awt::Desktop * getDesktop(); -private: static jboolean isDesktopSupported(); -public: virtual jboolean isSupported(::java::awt::Desktop$Action *); virtual void browse(::java::net::URI *); virtual void edit(::java::io::File *); diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h index c3b46bf7c75..46f81a1b846 100644 --- a/libjava/java/awt/Font.h +++ b/libjava/java/awt/Font.h @@ -156,6 +156,7 @@ public: // actually protected private: static const jlong serialVersionUID = -4206021311591459213LL; ::gnu::java::awt::peer::ClasspathFontPeer * peer; + jint hashCode__; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/awt/LightweightDispatcher.h b/libjava/java/awt/LightweightDispatcher.h index 0a0bc5026e4..4fee8f8b43f 100644 --- a/libjava/java/awt/LightweightDispatcher.h +++ b/libjava/java/awt/LightweightDispatcher.h @@ -44,6 +44,8 @@ private: static ::java::util::WeakHashMap * instances; ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastTarget; ::java::awt::Component * mouseEventTarget; +public: // actually package-private + static jboolean $assertionsDisabled; public: static ::java::lang::Class class$; }; |