reverted makefile.unix wx-config -- version 0.3.6

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@119 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 26 insertions, 1 deletions

diff --git a/script.h b/script.h
index dc47e1d836..c5744d9f3f 100644
--- a/script.h
+++ b/script.h
@@ -136,6 +136,20 @@ enum opcodetype
     OP_CHECKMULTISIG,

     OP_CHECKMULTISIGVERIFY,

 

+    // expansion

+    OP_NOP1,

+    OP_NOP2,

+    OP_NOP3,

+    OP_NOP4,

+    OP_NOP5,

+    OP_NOP6,

+    OP_NOP7,

+    OP_NOP8,

+    OP_NOP9,

+    OP_NOP10,

+

+

+

 

     // multi-byte opcodes

     OP_SINGLEBYTE_END = 0xF0,

@@ -276,6 +290,18 @@ inline const char* GetOpName(opcodetype opcode)
     case OP_CHECKMULTISIG          : return "OP_CHECKMULTISIG";

     case OP_CHECKMULTISIGVERIFY    : return "OP_CHECKMULTISIGVERIFY";

 

+    // expanson

+    case OP_NOP1                   : return "OP_NOP1";

+    case OP_NOP2                   : return "OP_NOP2";

+    case OP_NOP3                   : return "OP_NOP3";

+    case OP_NOP4                   : return "OP_NOP4";

+    case OP_NOP5                   : return "OP_NOP5";

+    case OP_NOP6                   : return "OP_NOP6";

+    case OP_NOP7                   : return "OP_NOP7";

+    case OP_NOP8                   : return "OP_NOP8";

+    case OP_NOP9                   : return "OP_NOP9";

+    case OP_NOP10                  : return "OP_NOP10";

+

 

 

     // multi-byte opcodes

@@ -285,7 +311,6 @@ inline const char* GetOpName(opcodetype opcode)
     case OP_PUBKEYHASH             : return "OP_PUBKEYHASH";

 

 

-

     case OP_INVALIDOPCODE          : return "OP_INVALIDOPCODE";

     default:

         return "UNKNOWN_OPCODE";