[Scummvm-cvs-logs] CVS: descumm descumm6.cpp,1.1.1.1,1.2 descumm5.cpp,1.2,1.3

Ludvig Strigeus strigeus at users.sourceforge.net
Sun Nov 11 02:39:02 CET 2001


Update of /cvsroot/scummvm/descumm
In directory usw-pr-cvs1:/tmp/cvs-serv26666

Modified Files:
	descumm6.cpp descumm5.cpp 
Log Message:
made files compile on unix, compile with -DUNIX

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/descumm/descumm6.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** descumm6.cpp	2001/11/08 19:03:07	1.1.1.1
--- descumm6.cpp	2001/11/11 10:38:19	1.2
***************
*** 22,27 ****
--- 22,35 ----
  #include <string.h>
  #include <stdio.h>
+ 
+ #ifdef UNIX
+ #include <ctype.h>
+ #endif
+ 
+ #ifdef WIN32
  #include <io.h>
  #include <process.h>
+ #endif
+ 
  #include <stdlib.h>
  #include <assert.h>

Index: descumm5.cpp
===================================================================
RCS file: /cvsroot/scummvm/descumm/descumm5.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** descumm5.cpp	2001/11/09 22:47:18	1.2
--- descumm5.cpp	2001/11/11 10:38:19	1.3
***************
*** 22,27 ****
--- 22,35 ----
  #include <string.h>
  #include <stdio.h>
+ 
+ #ifdef UNIX
+ #include <ctype.h>
+ #endif
+ 
+ #ifdef WIN32
  #include <io.h>
  #include <process.h>
+ #endif
+ 
  #include <stdlib.h>
  
***************
*** 979,983 ****
  	case 0x5B: s = " /= "; break; 		/* divide */
  	case 0x17: s = " &= "; break; 		/* and */
! 	case 0x46: s = (opcode&128) ? "--" : "++"; break; /* increment & decrement*/
      default:
        /* Exit, this should never happen, only if my code is buggy */
--- 987,995 ----
  	case 0x5B: s = " /= "; break; 		/* divide */
  	case 0x17: s = " &= "; break; 		/* and */
! 	case 0x46: if(opcode&128)
! 							 s = "--";
! 						 else
! 							 s = "++";
! 						 break; /* increment & decrement*/
      default:
        /* Exit, this should never happen, only if my code is buggy */





More information about the Scummvm-git-logs mailing list