[Pkg-bitcoin-commits] [libsecp256k1] 13/45: Merge #389: Cast pointers through uintptr_t under JNI

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libsecp256k1.

commit 2c52b5d2446170d71a053561714a64822bbb70f8
Merge: 43097a4 47b9e78
Author: Pieter Wuille <pieter.wuille at gmail.com>
Date:   Sun May 8 19:57:43 2016 +0200

    Merge #389: Cast pointers through uintptr_t under JNI
    
    47b9e78 Cast pointers through uintptr_t under JNI (Jon Griffiths)

 src/java/org_bitcoin_NativeSecp256k1.c  | 31 ++++++++++++++++---------------
 src/java/org_bitcoin_Secp256k1Context.c |  3 ++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --cc src/java/org_bitcoin_NativeSecp256k1.c
index 0171c44,0d339e7..dba9524
--- a/src/java/org_bitcoin_NativeSecp256k1.c
+++ b/src/java/org_bitcoin_NativeSecp256k1.c
@@@ -46,8 -47,9 +47,8 @@@ SECP256K1_API void JNICALL Java_org_bit
  SECP256K1_API jint JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ecdsa_1verify
    (JNIEnv* env, jclass classObject, jobject byteBufferObject, jlong ctx_l, jint siglen, jint publen)
  {
-   secp256k1_context *ctx = (secp256k1_context*)ctx_l;
+   secp256k1_context *ctx = (secp256k1_context*)(uintptr_t)ctx_l;
  
 -  int result;
    unsigned char* data = (unsigned char*) (*env)->GetDirectBufferAddress(env, byteBufferObject);
    const unsigned char* sigdata = {  (unsigned char*) (data + 32) };
    const unsigned char* pubdata = { (unsigned char*) (data + siglen + 32) };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libsecp256k1.git