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/defines.h | 75 ++----------------------------------------- 1 file changed, 2 insertions(+), 73 deletions(-) (limited to 'depends/pack200/src/defines.h') diff --git a/depends/pack200/src/defines.h b/depends/pack200/src/defines.h index 63abae0a..cfe5fc28 100644 --- a/depends/pack200/src/defines.h +++ b/depends/pack200/src/defines.h @@ -32,39 +32,22 @@ #include #endif -#ifndef FULL -#define FULL 1 /* Adds <500 bytes to the zipped final product. */ -#endif - -#if FULL // define this if you want debugging and/or compile-time attributes -#define IF_FULL(x) x -#else -#define IF_FULL(x) /*x*/ -#endif - // Error messages that we have -#define ERROR_ENOMEM "Native allocation failed" +#define ERROR_ENOMEM "Memory allocation failed" #define ERROR_FORMAT "Corrupted pack file" #define ERROR_RESOURCE "Cannot extract resource file" #define ERROR_OVERFLOW "Internal buffer overflow" #define ERROR_INTERNAL "Internal error" -#define LOGFILE_STDOUT "-" -#define LOGFILE_STDERR "" - #define lengthof(array) (sizeof(array) / sizeof(array[0])) #define NEW(T, n) (T *) must_malloc((int)(scale_size(n, sizeof(T)))) #define U_NEW(T, n) (T *) u->alloc(scale_size(n, sizeof(T))) #define T_NEW(T, n) (T *) u->temp_alloc(scale_size(n, sizeof(T))) -// bytes and byte arrays - -typedef unsigned int uint; +typedef signed char byte; #ifdef _MSC_VER -typedef LONGLONG jlong; -typedef DWORDLONG julong; #define MKDIR(dir) mkdir(dir) #define getpid() _getpid() #define PATH_MAX MAX_PATH @@ -73,64 +56,10 @@ typedef DWORDLONG julong; #define tempname _tempname #define sleep Sleep #else -typedef signed char byte; -#ifdef _LP64 -typedef long jlong; -typedef long unsigned julong; -#else -typedef long long jlong; -typedef long long unsigned julong; -#endif #define MKDIR(dir) mkdir(dir, 0777); #endif /* Must cast to void *, then size_t, then int. */ #define ptrlowbits(x) ((int)(size_t)(void *)(x)) -/* Back and forth from jlong to pointer */ -#define ptr2jlong(x) ((jlong)(size_t)(void *)(x)) -#define jlong2ptr(x) ((void *)(size_t)(x)) - -// Keys used by Java: -#define UNPACK_DEFLATE_HINT "unpack.deflate.hint" - -#define COM_PREFIX "com.sun.java.util.jar.pack." -#define UNPACK_MODIFICATION_TIME COM_PREFIX "unpack.modification.time" -#define DEBUG_VERBOSE COM_PREFIX "verbose" - -#define ZIP_ARCHIVE_MARKER_COMMENT "PACK200" - -// The following are not known to the Java classes: -#define UNPACK_REMOVE_PACKFILE COM_PREFIX "unpack.remove.packfile" - -// Called from unpacker layers -#define _CHECK_DO(t, x) \ - { \ - if (t) \ - { \ - x; \ - } \ - } - -#define CHECK _CHECK_DO(aborting(), return) -#define CHECK_(y) _CHECK_DO(aborting(), return y) -#define CHECK_0 _CHECK_DO(aborting(), return 0) - -#define CHECK_NULL(p) _CHECK_DO((p) == nullptr, return) -#define CHECK_NULL_(y, p) _CHECK_DO((p) == nullptr, return y) -#define CHECK_NULL_0(p) _CHECK_DO((p) == nullptr, return 0) - -#define CHECK_COUNT(t) \ - if (t < 0) \ - { \ - abort("bad value count"); \ - } \ - CHECK - -#define STR_TRUE "true" -#define STR_FALSE "false" - -#define STR_TF(x) ((x) ? STR_TRUE : STR_FALSE) -#define BOOL_TF(x) (((x) != nullptr &&strcmp((x), STR_TRUE) == 0) ? true : false) - #define DEFAULT_ARCHIVE_MODTIME 1060000000 // Aug 04, 2003 5:26 PM PDT -- cgit v1.2.3