mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backout changeset 310e29c26ea3 (bug 798564) for breaking Windows builds
This commit is contained in:
parent
1d7769929b
commit
535efd138c
@ -8,6 +8,7 @@
|
||||
#define MAR_H__
|
||||
|
||||
/* We use NSPR here just to import the definition of uint32_t */
|
||||
#include "prtypes.h"
|
||||
#include "mozilla/StandardInteger.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -6,6 +6,7 @@
|
||||
#define MAR_CMDLINE_H__
|
||||
|
||||
/* We use NSPR here just to import the definition of uint32_t */
|
||||
#include "prtypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -7,10 +7,15 @@
|
||||
#ifndef MAR_PRIVATE_H__
|
||||
#define MAR_PRIVATE_H__
|
||||
|
||||
#include "prtypes.h"
|
||||
#include "limits.h"
|
||||
#include "mozilla/Assertions.h"
|
||||
#include "mozilla/StandardInteger.h"
|
||||
|
||||
/* Code in this module requires a guarantee that the size
|
||||
of uint32_t and uint64_t are 4 and 8 bytes respectively. */
|
||||
PR_STATIC_ASSERT(sizeof(uint32_t) == 4);
|
||||
PR_STATIC_ASSERT(sizeof(uint64_t) == 8);
|
||||
|
||||
#define BLOCKSIZE 4096
|
||||
#define ROUND_UP(n, incr) (((n) / (incr) + 1) * (incr))
|
||||
|
||||
@ -31,14 +36,12 @@
|
||||
|
||||
/* Existing code makes assumptions that the file size is
|
||||
smaller than LONG_MAX. */
|
||||
MOZ_STATIC_ASSERT(MAX_SIZE_OF_MAR_FILE < ((int64_t)LONG_MAX),
|
||||
"max mar file size is too big");
|
||||
PR_STATIC_ASSERT(MAX_SIZE_OF_MAR_FILE < ((int64_t)LONG_MAX));
|
||||
|
||||
/* We store at most the size up to the signature block + 4
|
||||
bytes per BLOCKSIZE bytes */
|
||||
MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
|
||||
(SIGNATURE_BLOCK_OFFSET + sizeof(uint32_t)),
|
||||
"BLOCKSIZE is too big");
|
||||
PR_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
|
||||
(SIGNATURE_BLOCK_OFFSET + sizeof(uint32_t)));
|
||||
|
||||
/* The maximum size of any signature supported by current and future
|
||||
implementations of the signmar program. */
|
||||
|
Loading…
Reference in New Issue
Block a user