mirror of
https://github.com/corda/corda.git
synced 2025-03-12 23:44:13 +00:00
fix multiple-include-of-stdint errors
This commit is contained in:
parent
9327043bc5
commit
0b01dd565a
@ -8,8 +8,8 @@
|
|||||||
There is NO WARRANTY for this software. See license.txt for
|
There is NO WARRANTY for this software. See license.txt for
|
||||||
details. */
|
details. */
|
||||||
|
|
||||||
#ifndef COMMON_H
|
#ifndef AVIAN_COMMON_H
|
||||||
#define COMMON_H
|
#define AVIAN_COMMON_H
|
||||||
|
|
||||||
#ifndef __STDC_CONSTANT_MACROS
|
#ifndef __STDC_CONSTANT_MACROS
|
||||||
# define __STDC_CONSTANT_MACROS
|
# define __STDC_CONSTANT_MACROS
|
||||||
@ -113,7 +113,7 @@ typedef intptr_t intptr_alias_t;
|
|||||||
|
|
||||||
#else // not _MSC_VER
|
#else // not _MSC_VER
|
||||||
|
|
||||||
# include "stdint.h"
|
# include <stdint.h>
|
||||||
|
|
||||||
# define BYTES_PER_WORD __SIZEOF_POINTER__
|
# define BYTES_PER_WORD __SIZEOF_POINTER__
|
||||||
|
|
||||||
@ -554,4 +554,4 @@ equal(const void* a, unsigned al, const void* b, unsigned bl)
|
|||||||
|
|
||||||
} // namespace vm
|
} // namespace vm
|
||||||
|
|
||||||
#endif // COMMON_H
|
#endif // AVIAN_COMMON_H
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
details. */
|
details. */
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "avian/environment.h"
|
#include "avian/environment.h"
|
||||||
|
@ -8,8 +8,6 @@
|
|||||||
There is NO WARRANTY for this software. See license.txt for
|
There is NO WARRANTY for this software. See license.txt for
|
||||||
details. */
|
details. */
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
#include "avian/target.h"
|
#include "avian/target.h"
|
||||||
#include "avian/alloc-vector.h"
|
#include "avian/alloc-vector.h"
|
||||||
#include "avian/allocator.h"
|
#include "avian/allocator.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user