From 8aa540d2f783474d1d2e06f16744bf67b9c1facc Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Fri, 10 Mar 2006 21:46:48 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
---
 libjava/classpath/java/util/zip/ZipConstants.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libjava/classpath/java/util/zip/ZipConstants.java')

diff --git a/libjava/classpath/java/util/zip/ZipConstants.java b/libjava/classpath/java/util/zip/ZipConstants.java
index 952a44d..6d66419 100644
--- a/libjava/classpath/java/util/zip/ZipConstants.java
+++ b/libjava/classpath/java/util/zip/ZipConstants.java
@@ -1,5 +1,5 @@
 /* java.util.zip.ZipConstants
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,7 @@ interface ZipConstants
 {
   /* The local file header */
   int LOCHDR = 30;
-  int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
+  long LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
 
   int LOCVER =  4;
   int LOCFLG =  6;
@@ -54,7 +54,7 @@ interface ZipConstants
   int LOCEXT = 28;
 
   /* The Data descriptor */
-  int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
+  long EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
   int EXTHDR = 16;
 
   int EXTCRC =  4;
@@ -62,7 +62,7 @@ interface ZipConstants
   int EXTLEN = 12;
 
   /* The central directory file header */
-  int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
+  long CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
   int CENHDR = 46;
 
   int CENVEM =  4;
@@ -82,7 +82,7 @@ interface ZipConstants
   int CENOFF = 42;
 
   /* The entries in the end of central directory */
-  int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
+  long ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
   int ENDHDR = 22;
 
   /* The following two fields are missing in SUN JDK */
-- 
cgit v1.1