Merge pull request #324 from dicej/unused

explicitly override UNUSED definition
This commit is contained in:
Joshua Warner 2014-08-18 08:09:18 -06:00
commit 298eb8f13b
3 changed files with 9 additions and 1 deletions

View File

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

View File

@ -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>

View File

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