[vba-commit] VisualBoyAdvance/src/sdl SDL.cpp,1.10,1.11 debugger.cpp,1.7,1.8

[Spacy <sp...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/sdl
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6744/src/sdl

Modified Files:
	SDL.cpp debugger.cpp 
Log Message:
vs2005 compatibility

Index: SDL.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SDL.cpp	8 May 2006 10:12:44 -0000	1.10
--- SDL.cpp	13 May 2006 16:32:16 -0000	1.11
***************
*** 24,42 ****
  #include <sys/stat.h>
  
! #include "AutoBuild.h"
  
  #include "SDL.h"
! #include "GBA.h"
! #include "agbprint.h"
! #include "Flash.h"
! #include "Port.h"
  #include "debugger.h"
! #include "RTC.h"
! #include "Sound.h"
! #include "Text.h"
! #include "unzip.h"
! #include "Util.h"
! #include "gb/GB.h"
! #include "gb/gbGlobals.h"
  
  #ifndef WIN32
--- 24,42 ----
  #include <sys/stat.h>
  
! #include "../AutoBuild.h"
  
  #include "SDL.h"
! #include "../GBA.h"
! #include "../agbprint.h"
! #include "../Flash.h"
! #include "../Port.h"
  #include "debugger.h"
! #include "../RTC.h"
! #include "../Sound.h"
! #include "../Text.h"
! #include "../unzip.h"
! #include "../Util.h"
! #include "../gb/GB.h"
! #include "../gb/gbGlobals.h"
  
  #ifndef WIN32
***************
*** 51,55 ****
  # define HAVE_DECL_GETOPT 0
  # define __STDC__ 1
! # include "getopt.h"
  #else // ! __GNUC__
  # define HAVE_DECL_GETOPT 1
--- 51,55 ----
  # define HAVE_DECL_GETOPT 0
  # define __STDC__ 1
! # include "../getopt.h"
  #else // ! __GNUC__
  # define HAVE_DECL_GETOPT 1

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** debugger.cpp	25 Jun 2005 06:17:52 -0000	1.7
--- debugger.cpp	13 May 2006 16:32:16 -0000	1.8
***************
*** 24,32 ****
  #include <ctype.h>
  
! #include "GBA.h"
! #include "Port.h"
! #include "armdis.h"
! #include "elf.h"
! #include "exprNode.h"
  
  extern bool debugger;
--- 24,32 ----
  #include <ctype.h>
  
! #include "../GBA.h"
! #include "../Port.h"
! #include "../armdis.h"
! #include "../elf.h"
! #include "../exprNode.h"
  
  extern bool debugger;
***************
*** 1067,1071 ****
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(int i = address; i < final; i++)
            if(freezeWorkRAM[i] == 1)
              freezeWorkRAM[i] = 0;
--- 1067,1071 ----
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(u32 i = address; i < final; i++)
            if(freezeWorkRAM[i] == 1)
              freezeWorkRAM[i] = 0;
***************
*** 1078,1082 ****
          address &= 0x7fff;
          final &= 0x7fff;
!         for(int i = address; i < final; i++)
            if(freezeInternalRAM[i] == 1)
              freezeInternalRAM[i] = 0;
--- 1078,1082 ----
          address &= 0x7fff;
          final &= 0x7fff;
!         for(u32 i = address; i < final; i++)
            if(freezeInternalRAM[i] == 1)
              freezeInternalRAM[i] = 0;
***************
*** 1167,1171 ****
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(int i = address; i < final; i++)
            if(freezeWorkRAM[i] == 2)
              freezeWorkRAM[i] = 0;
--- 1167,1171 ----
          address &= 0x3ffff;
          final &= 0x3ffff;
!         for(u32 i = address; i < final; i++)
            if(freezeWorkRAM[i] == 2)
              freezeWorkRAM[i] = 0;
***************
*** 1178,1182 ****
          address &= 0x7fff;
          final &= 0x7fff;
!         for(int i = address; i < final; i++)
            if(freezeInternalRAM[i] == 2)
              freezeInternalRAM[i] = 0;
--- 1178,1182 ----
          address &= 0x7fff;
          final &= 0x7fff;
!         for(u32 i = address; i < final; i++)
            if(freezeInternalRAM[i] == 2)
              freezeInternalRAM[i] = 0;
***************
*** 1604,1608 ****
      u32 addr = 0;
      sscanf(args[1], "%x", &addr);
!     for(int i = 0; i < 16; i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);
--- 1604,1608 ----
      u32 addr = 0;
      sscanf(args[1], "%x", &addr);
!     for(int _i = 0; _i < 16; _i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);
***************
*** 1640,1644 ****
      sscanf(args[1], "%x", &addr);
      addr = addr & 0xfffffffe;
!     for(int i = 0; i < 16; i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);
--- 1640,1644 ----
      sscanf(args[1], "%x", &addr);
      addr = addr & 0xfffffffe;
!     for(int _i = 0; _i < 16; _i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);
***************
*** 1676,1680 ****
      sscanf(args[1], "%x", &addr);
      addr = addr & 0xfffffffc;
!     for(int i = 0; i < 16; i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);
--- 1676,1680 ----
      sscanf(args[1], "%x", &addr);
      addr = addr & 0xfffffffc;
!     for(int _i = 0; _i < 16; _i++) {
        int a = debuggerReadByte(addr);
        int b = debuggerReadByte(addr+1);