diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-23 20:19:06 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-23 20:19:06 +0000 |
| commit | dea399b9ca84ed668aa3da7477dacd04e0192fa5 (patch) | |
| tree | e4235e098426338fd3e0a267c1a8652af558814c /libjava/java/util/zip | |
| parent | 3d956c0659ce15647c319f5e5988034f9e157095 (diff) | |
| download | gcc-dea399b9ca84ed668aa3da7477dacd04e0192fa5.tar.gz | |
2008-10-23 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r141325
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@141329 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/zip')
| -rw-r--r-- | libjava/java/util/zip/ZipEntry.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libjava/java/util/zip/ZipEntry.h b/libjava/java/util/zip/ZipEntry.h index 7e1cc8f518f..47cb903a8d6 100644 --- a/libjava/java/util/zip/ZipEntry.h +++ b/libjava/java/util/zip/ZipEntry.h @@ -25,9 +25,6 @@ public: virtual ::java::lang::String * getName(); virtual void setTime(jlong); virtual jlong getTime(); -private: - static ::java::util::Calendar * getCalendar(); -public: virtual void setSize(jlong); virtual jlong getSize(); virtual void setCompressedSize(jlong); @@ -47,21 +44,22 @@ public: virtual ::java::lang::String * toString(); virtual jint hashCode(); private: - static const jint KNOWN_SIZE = 1; - static const jint KNOWN_CSIZE = 2; - static const jint KNOWN_CRC = 4; - static const jint KNOWN_TIME = 8; - static const jint KNOWN_EXTRA = 16; - static ::java::util::Calendar * cal; + static const jbyte KNOWN_SIZE = 1; + static const jbyte KNOWN_CSIZE = 2; + static const jbyte KNOWN_CRC = 4; + static const jbyte KNOWN_TIME = 8; + static const jbyte KNOWN_DOSTIME = 16; + static const jbyte KNOWN_EXTRA = 32; ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; jint size; jlong compressedSize; jint crc; + ::java::lang::String * comment; + jbyte method; + jbyte known; jint dostime; - jshort known; - jshort method; + jlong time; JArray< jbyte > * extra; - ::java::lang::String * comment; public: // actually package-private jint flags; jint offset; |