diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-04-28 23:46:11 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-04-28 23:46:11 +0000 |
| commit | 675933670487aca8fb339d4865fe46a69d7abc73 (patch) | |
| tree | 0587ba0d88930c645c2c7dd933fa2b89f5475c68 /security/nss/lib/jar | |
| parent | af734937767d295032a58bee9ccaf644d72be353 (diff) | |
| download | nss-hg-675933670487aca8fb339d4865fe46a69d7abc73.tar.gz | |
Bug 487007: Make lib/jar conform to NSS coding style, eliminate Win16 hacks,
and fix gross bugs r=julien.pierre
Diffstat (limited to 'security/nss/lib/jar')
| -rw-r--r-- | security/nss/lib/jar/config.mk | 11 | ||||
| -rw-r--r-- | security/nss/lib/jar/jarfile.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/security/nss/lib/jar/config.mk b/security/nss/lib/jar/config.mk index 665828c63..331dd1904 100644 --- a/security/nss/lib/jar/config.mk +++ b/security/nss/lib/jar/config.mk @@ -45,3 +45,14 @@ SHARED_LIBRARY = IMPORT_LIBRARY = PROGRAM = +# NSS_X86 means the target is a 32-bits x86 CPU architecture +# NSS_X64 means the target is a 64-bits x64 CPU architecture +# NSS_X86_OR_X64 means the target is either x86 or x64 +ifeq (,$(filter-out x386 x86 x86_64,$(CPU_ARCH))) + DEFINES += -DNSS_X86_OR_X64 +ifdef USE_64 + DEFINES += -DNSS_X64 +else + DEFINES += -DNSS_X86 +endif +endif diff --git a/security/nss/lib/jar/jarfile.c b/security/nss/lib/jar/jarfile.c index 3393d0f56..de2b5c587 100644 --- a/security/nss/lib/jar/jarfile.c +++ b/security/nss/lib/jar/jarfile.c @@ -57,6 +57,7 @@ PR_STATIC_ASSERT(46 == sizeof(struct ZipCentral)); PR_STATIC_ASSERT(30 == sizeof(struct ZipLocal)); PR_STATIC_ASSERT(22 == sizeof(struct ZipEnd)); +PR_STATIC_ASSERT(512 == sizeof(union TarEntry)); /* extracting */ static int @@ -846,7 +847,6 @@ loser: * .tar file into the JAR linked list. * */ - static int jar_listtar(JAR *jar, JAR_FILE fp) { |