ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

explicitly override UNUSED definition

Browse Source 
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:
Joel Dice 2014-08-17 15:34:44 -06:00
parent 6c2c7448d6
commit 5b618982b5
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classpath/jni-util.h
View File

@ -19,6 +19,10 @@
#undef JNIEXPORT #undef JNIEXPORT
#ifdef UNUSED
#undef UNUSED
#endif
#if (defined __MINGW32__) || (defined _MSC_VER) #if (defined __MINGW32__) || (defined _MSC_VER)
#define PLATFORM_WINDOWS #define PLATFORM_WINDOWS
#define PATH_SEPARATOR ';' #define PATH_SEPARATOR ';'

2
classpath/sockets.h
View File

@ -16,9 +16,9 @@
#ifndef SOCKETS_H_ #ifndef SOCKETS_H_
#define SOCKETS_H_ #define SOCKETS_H_
#include "avian/common.h"
#include "jni.h" #include "jni.h"
#include "jni-util.h" #include "jni-util.h"
#include "avian/common.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
#include <winsock2.h> #include <winsock2.h>

4
src/avian/common.h
View File

@ -25,6 +25,10 @@
#include "avian/types.h" #include "avian/types.h"
#include "math.h" #include "math.h"
#ifdef UNUSED
#undef UNUSED
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#include "float.h" #include "float.h"