Merge pull request #350 from svost/c++11

[novacoin.git] / src / script.h

diff --git a/src/script.h b/src/script.h
index 85fcf94..28def01 100644 (file)
--- a/src/script.h
+++ b/src/script.h
@@ -399,6 +399,6 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
 
 // Given two sets of signatures for scriptPubKey, possibly with OP_0 placeholders,
 // combine them intelligently and return the result.
-CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2);
+CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, uint32_t nIn, const CScript& scriptSig1, const CScript& scriptSig2);
 
 #endif