Merge pull request bitcoin#258

sipa · sipa · commit b0a60e6d3381 · 2015-07-13T21:03:47.000-04:00
e2a07c7 Fix compilation with C++ (Vinnie Falco)
diff --git a/src/ecmult_impl.h b/src/ecmult_impl.h
@@ -93,9 +93,9 @@ static void secp256k1_ecmult_odd_multiples_table_globalz_windowa(secp256k1_ge_t
 }
 
 static void secp256k1_ecmult_odd_multiples_table_storage_var(int n, secp256k1_ge_storage_t *pre, const secp256k1_gej_t *a) {
-    secp256k1_gej_t *prej = checked_malloc(sizeof(secp256k1_gej_t) * n);
-    secp256k1_ge_t *prea = checked_malloc(sizeof(secp256k1_ge_t) * n);
-    secp256k1_fe_t *zr = checked_malloc(sizeof(secp256k1_fe_t) * n);
+    secp256k1_gej_t *prej = (secp256k1_gej_t*)checked_malloc(sizeof(secp256k1_gej_t) * n);
+    secp256k1_ge_t *prea = (secp256k1_ge_t*)checked_malloc(sizeof(secp256k1_ge_t) * n);
+    secp256k1_fe_t *zr = (secp256k1_fe_t*)checked_malloc(sizeof(secp256k1_fe_t) * n);
     int i;
 
     /* Compute the odd multiples in Jacobian form. */
