--- np2/i386c/ia32/instructions/ctrl_trans.h	2004/02/05 16:43:45	1.3
+++ np2/i386c/ia32/instructions/ctrl_trans.h	2011/01/15 17:17:23	1.7
@@ -1,5 +1,3 @@
-/*	$Id: ctrl_trans.h,v 1.3 2004/02/05 16:43:45 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -40,12 +36,12 @@ extern "C" {
 void JMP_Jb(void);
 void JMP_Jw(void);
 void JMP_Jd(void);
-void JMP_Ew(DWORD);
-void JMP_Ed(DWORD);
+void JMP_Ew(UINT32);
+void JMP_Ed(UINT32);
 void JMP16_Ap(void);
 void JMP32_Ap(void);
-void JMP16_Ep(DWORD);
-void JMP32_Ep(DWORD);
+void JMP16_Ep(UINT32);
+void JMP32_Ep(UINT32);
 
 /*
  * Jcc
@@ -112,12 +108,12 @@ void LOOP_Jb(void);
  */
 void CALL_Aw(void);
 void CALL_Ad(void);
-void CALL_Ew(DWORD);
-void CALL_Ed(DWORD);
+void CALL_Ew(UINT32);
+void CALL_Ed(UINT32);
 void CALL16_Ap(void);
 void CALL32_Ap(void);
-void CALL16_Ep(DWORD);
-void CALL32_Ep(DWORD);
+void CALL16_Ep(UINT32);
+void CALL32_Ep(UINT32);
 
 /*
  * RET
@@ -148,8 +144,7 @@ void BOUND_GdMa(void);
  */
 void ENTER16_IwIb(void);
 void ENTER32_IwIb(void);
-void LEAVE16(void);
-void LEAVE32(void);
+void LEAVE(void);
 
 #ifdef __cplusplus
 }