mirror of
https://github.com/corda/corda.git
synced 2025-01-03 19:54:13 +00:00
explicitly override UNUSED definition
Recent versions of jni.h such as the one provided by Debian Jessie's OpenJDK define UNUSED in a way that conflicts with our definition and usage, so we need to explicitly undefine it before redefining it to avoid compiler noise.
This commit is contained in:
parent
6c2c7448d6
commit
5b618982b5
@ -19,6 +19,10 @@
|
||||
|
||||
#undef JNIEXPORT
|
||||
|
||||
#ifdef UNUSED
|
||||
#undef UNUSED
|
||||
#endif
|
||||
|
||||
#if (defined __MINGW32__) || (defined _MSC_VER)
|
||||
#define PLATFORM_WINDOWS
|
||||
#define PATH_SEPARATOR ';'
|
||||
|
@ -16,9 +16,9 @@
|
||||
#ifndef SOCKETS_H_
|
||||
#define SOCKETS_H_
|
||||
|
||||
#include "avian/common.h"
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
#include "avian/common.h"
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
#include <winsock2.h>
|
||||
|
@ -25,6 +25,10 @@
|
||||
#include "avian/types.h"
|
||||
#include "math.h"
|
||||
|
||||
#ifdef UNUSED
|
||||
#undef UNUSED
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#include "float.h"
|
||||
|
Loading…
Reference in New Issue
Block a user