You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/07/09 14:30:39 UTC
commons-crypto git commit: Fix up Windows build:
Repository: commons-crypto
Updated Branches:
refs/heads/master de52abeff -> 2d38230a3
Fix up Windows build:
Needs config.h
Needs Unicode String
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/2d38230a
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/2d38230a
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/2d38230a
Branch: refs/heads/master
Commit: 2d38230a36503dada2aadfd430369ab47fb5f715
Parents: de52abe
Author: Sebb <se...@apache.org>
Authored: Sat Jul 9 15:30:33 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Sat Jul 9 15:30:33 2016 +0100
----------------------------------------------------------------------
lib/include/config.h | 2 +-
.../native/org/apache/commons/crypto/org_apache_commons_crypto.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/2d38230a/lib/include/config.h
----------------------------------------------------------------------
diff --git a/lib/include/config.h b/lib/include/config.h
index 8b4c1d4..93d90ef 100755
--- a/lib/include/config.h
+++ b/lib/include/config.h
@@ -20,7 +20,7 @@
#define __CONFIG_H
#if defined(WINDOWS)
- #define COMMONS_CRYPTO_OPENSSL_LIBRARY "libcrypto.dll"
+ #define COMMONS_CRYPTO_OPENSSL_LIBRARY L"libcrypto.dll"
#elif defined(MAC_OS)
#define COMMONS_CRYPTO_OPENSSL_LIBRARY "libcrypto.dylib"
#else
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/2d38230a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
----------------------------------------------------------------------
diff --git a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
index d0e58a5..f39faa7 100644
--- a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
+++ b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
@@ -193,6 +193,7 @@ static FARPROC WINAPI do_dlsym(JNIEnv *env, HMODULE handle, LPCSTR symbol) {
#endif
#ifdef WINDOWS
+#include "config.h"
#include "winutils.h"
#endif