You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2016/06/12 11:32:52 UTC
commons-crypto git commit: CRYPTO-65: Warnings compiling on MacOSX -
JNIEXPORT redefined. Thanks to sebb.
Repository: commons-crypto
Updated Branches:
refs/heads/master 715a25d9e -> 6b3f3b54c
CRYPTO-65: Warnings compiling on MacOSX - JNIEXPORT redefined. Thanks to sebb.
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/6b3f3b54
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/6b3f3b54
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/6b3f3b54
Branch: refs/heads/master
Commit: 6b3f3b54c7c1b7201c0569e673bb0dfc12ff2041
Parents: 715a25d
Author: Benedikt Ritter <be...@gmail.com>
Authored: Sun Jun 12 13:32:34 2016 +0200
Committer: Benedikt Ritter <be...@gmail.com>
Committed: Sun Jun 12 13:32:34 2016 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c | 3 +++
.../org/apache/commons/crypto/random/OpensslCryptoRandomNative.c | 3 +++
3 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/6b3f3b54/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d12d1a5..6d1755e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -39,6 +39,7 @@
</properties>
<body>
<release version="1.0.0" date="2016-06-06" description="Feature and bug fix release">
+ <action issue="CRYPTO-65" type="fix" dev="britter" due-to="sebb">Warnings compiling on MacOSX - JNIEXPORT redefined.</action>
<action issue="CRYPTO-11" type="add" dev="Ke Jia" due-to="Ke Jia, Jerry Chen">User guide documentation .</action>
<action issue="CRYPTO-12" type="add" dev="Xianda Ke" due-to="Xianda Ke">Rename CryptoInputStream to CipherInputStream and CryptoOutputStream to CipherOutputStream .</action>
<action issue="CRYPTO-13" type="add" dev="Xianda Ke" due-to="Xianda Ke">The API differences between apache.commons.crypto and JCE .</action>
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/6b3f3b54/src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c
----------------------------------------------------------------------
diff --git a/src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c b/src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c
index 8ed8cff..987af95 100644
--- a/src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c
+++ b/src/main/native/org/apache/commons/crypto/cipher/OpensslNative.c
@@ -23,6 +23,9 @@
#include <string.h>
// export the native interfaces
+#ifdef JNIEXPORT
+#undef JNIEXPORT
+#endif
#define JNIEXPORT __attribute__((__visibility__("default")))
#include "OpensslNative.h"
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/6b3f3b54/src/main/native/org/apache/commons/crypto/random/OpensslCryptoRandomNative.c
----------------------------------------------------------------------
diff --git a/src/main/native/org/apache/commons/crypto/random/OpensslCryptoRandomNative.c b/src/main/native/org/apache/commons/crypto/random/OpensslCryptoRandomNative.c
index 65f4c6f..09c9af4 100644
--- a/src/main/native/org/apache/commons/crypto/random/OpensslCryptoRandomNative.c
+++ b/src/main/native/org/apache/commons/crypto/random/OpensslCryptoRandomNative.c
@@ -34,6 +34,9 @@
#endif
// export the native interfaces
+#ifdef JNIEXPORT
+#undef JNIEXPORT
+#endif
#define JNIEXPORT __attribute__((__visibility__("default")))
#include "OpensslCryptoRandomNative.h"