wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798564 - remove prtypes.h #includes in modules/libmar/; r=ehsan

Browse Source
This commit is contained in:
Nathan Froyd 2012-10-05 17:13:49 -04:00
parent fc906b7c56
commit 8bfb941d4c
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/libmar/src/mar.h
View File

@ -8,7 +8,6 @@
#define MAR_H__
/* We use NSPR here just to import the definition of uint32_t */
#include "prtypes.h"
#include "mozilla/StandardInteger.h"
#ifdef __cplusplus

1
modules/libmar/src/mar_cmdline.h
View File

@ -6,7 +6,6 @@
#define MAR_CMDLINE_H__
/* We use NSPR here just to import the definition of uint32_t */
#include "prtypes.h"
#ifdef __cplusplus
extern "C" {

15
modules/libmar/src/mar_private.h
View File

@ -7,15 +7,10 @@
#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))
@ -36,12 +31,14 @@ PR_STATIC_ASSERT(sizeof(uint64_t) == 8);
/* Existing code makes assumptions that the file size is
smaller than LONG_MAX. */
PR_STATIC_ASSERT(MAX_SIZE_OF_MAR_FILE < ((int64_t)LONG_MAX));
MOZ_STATIC_ASSERT(MAX_SIZE_OF_MAR_FILE < ((int64_t)LONG_MAX),
"max mar file size is too big");
/* We store at most the size up to the signature block + 4
bytes per BLOCKSIZE bytes */
PR_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
(SIGNATURE_BLOCK_OFFSET + sizeof(uint32_t)));
MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
(SIGNATURE_BLOCK_OFFSET + sizeof(uint32_t)),
"BLOCKSIZE is too big");
/* The maximum size of any signature supported by current and future
implementations of the signmar program. */