From 604162acdf5283a9759c1b3ce9e90887a6599ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 29 Sep 2013 21:11:30 +0200 Subject: Turn pack200 into an actual library --- depends/pack200/src/bands.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'depends/pack200/src/bands.h') diff --git a/depends/pack200/src/bands.h b/depends/pack200/src/bands.h index 3f944481..a56cd7d5 100644 --- a/depends/pack200/src/bands.h +++ b/depends/pack200/src/bands.h @@ -150,11 +150,11 @@ struct band return getRefCommon(ix2, true); } entry *getRefCommon(cpindex *ix, bool nullOK); - jlong getLong(band &lo_band, bool have_hi); + int64_t getLong(band &lo_band, bool have_hi); - static jlong makeLong(uint hi, uint lo) + static int64_t makeLong(uint32_t hi, uint32_t lo) { - return ((julong)hi << 32) + (((julong)lo << 32) >> 32); + return ((uint64_t)hi << 32) + (((uint64_t)lo << 32) >> 32); } int getIntTotal(); @@ -162,9 +162,6 @@ struct band static band *makeBands(unpacker *u); static void initIndexes(unpacker *u); - - void abort(const char *msg = nullptr); //{ u->abort(msg); } - bool aborting(); //{ return u->aborting(); } }; extern band all_bands[]; -- cgit v1.2.3