vba-commit

[Sébastien G. <kx...@us...>]

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

Modified Files:
	GBAinline.h expr-lex.cpp expr.l exprNode.cpp memgzio.h 
	remote.cpp 
Log Message:
FIX: fixed compilation issues on Linux

Index: expr.l
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/expr.l,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** expr.l	20 Oct 2002 13:03:12 -0000	1.1
--- expr.l	3 Sep 2006 21:52:25 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  #include <io.h>
  #define isatty _isatty
+ #define fileno _fileno
  #endif
  

Index: expr-lex.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/expr-lex.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** expr-lex.cpp	13 May 2006 16:32:15 -0000	1.3
--- expr-lex.cpp	3 Sep 2006 21:52:25 -0000	1.4
***************
*** 387,390 ****
--- 387,391 ----
  #include <io.h>
  #define isatty _isatty
+ #define fileno _fileno
  #endif
  
***************
*** 1286,1290 ****
          b->yy_is_interactive = 0;
  #else
!         b->yy_is_interactive = file ? (isatty( _fileno(file) ) > 0) : 0;
  #endif
  #endif
--- 1287,1291 ----
          b->yy_is_interactive = 0;
  #else
!         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
  #endif
  #endif

Index: memgzio.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/memgzio.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** memgzio.h	23 Aug 2006 22:13:29 -0000	1.3
--- memgzio.h	3 Sep 2006 21:52:25 -0000	1.4
***************
*** 9,13 ****
   * Adapted from original gzio.c from zlib library by Forgotten
   */
! #include <zutil.h>
  
  gzFile ZEXPORT memgzopen(char *memory, int, const char *);
--- 9,18 ----
   * Adapted from original gzio.c from zlib library by Forgotten
   */
! 
! #if defined(HAVE_ZUTIL_H) || defined(_WIN32) 	 
! # include <zutil.h>
! #else
! # include "../win32/dependencies/zlib/zutil.h"
! #endif
  
  gzFile ZEXPORT memgzopen(char *memory, int, const char *);

Index: exprNode.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/exprNode.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exprNode.cpp	13 May 2006 16:32:15 -0000	1.4
--- exprNode.cpp	3 Sep 2006 21:52:25 -0000	1.5
***************
*** 26,29 ****
--- 26,33 ----
  #include "exprNode.h"
  
+ #ifndef __GNUC__
+ #define strdup _strdup
+ #endif
+ 
  extern char *yytext;
  
***************
*** 51,55 ****
  {
    Node *n = (Node *)calloc(1, sizeof(Node));
!   n->name = _strdup(yytext);
  
    exprNodeClean(n->name);  
--- 55,59 ----
  {
    Node *n = (Node *)calloc(1, sizeof(Node));
!   n->name = strdup(yytext);
  
    exprNodeClean(n->name);  

Index: GBAinline.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBAinline.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** GBAinline.h	24 Jun 2006 20:21:47 -0000	1.16
--- GBAinline.h	3 Sep 2006 21:52:25 -0000	1.17
***************
*** 54,58 ****
    READ32LE(((u32*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
  
! inline u32 CPUReadMemory(u32 address)
  {
  
--- 54,58 ----
    READ32LE(((u32*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
  
! static inline u32 CPUReadMemory(u32 address)
  {
  
***************
*** 179,183 ****
  extern u32 myROM[];
  
! inline u32 CPUReadHalfWord(u32 address)
  {
  #ifdef DEV_VERSION      
--- 179,183 ----
  extern u32 myROM[];
  
! static inline u32 CPUReadHalfWord(u32 address)
  {
  #ifdef DEV_VERSION      
***************
*** 298,302 ****
  }
  
! inline u16 CPUReadHalfWordSigned(u32 address)
  {
    u16 value = CPUReadHalfWord(address);
--- 298,302 ----
  }
  
! static inline u16 CPUReadHalfWordSigned(u32 address)
  {
    u16 value = CPUReadHalfWord(address);
***************
*** 306,310 ****
  }
  
! inline u8 CPUReadByte(u32 address)
  {
    switch(address >> 24) {
--- 306,310 ----
  }
  
! static inline u8 CPUReadByte(u32 address)
  {
    switch(address >> 24) {
***************
*** 388,392 ****
  }
  
! inline void CPUWriteMemory(u32 address, u32 value)
  {
  
--- 388,392 ----
  }
  
! static inline void CPUWriteMemory(u32 address, u32 value)
  {
  

Index: remote.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/remote.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** remote.cpp	6 Jun 2006 22:32:19 -0000	1.10
--- remote.cpp	3 Sep 2006 21:52:25 -0000	1.11
***************
*** 33,36 ****
--- 33,37 ----
  #  define socklen_t int
  # endif // ! HAVE_ARPA_INET_H
+ # define SOCKET int
  #else // _WIN32
  # include <winsock.h>