Merge pull request #1126 from drizztbsd/master
authorPieter Wuille <pieter.wuille@gmail.com>
Sat, 21 Apr 2012 22:13:29 +0000 (15:13 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Sat, 21 Apr 2012 22:13:29 +0000 (15:13 -0700)
Fix build with gcc 4.7

1  2 
src/uint256.h

diff --combined src/uint256.h
@@@ -6,6 -6,7 +6,7 @@@
  #define BITCOIN_UINT256_H
  
  #include <limits.h>
+ #include <stdio.h>
  #include <string.h>
  #include <string>
  #include <vector>
@@@ -305,7 -306,7 +306,7 @@@ public
              psz += 2;
  
          // hex string to uint
 -        static char phexdigit[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0 };
 +        static unsigned char phexdigit[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0 };
          const char* pbegin = psz;
          while (phexdigit[(unsigned char)*psz] || *psz == '0')
              psz++;