Diff for /np2/x11/compiler.h between versions 1.34 and 1.39

version 1.34, 2007/01/23 15:48:20 version 1.39, 2011/01/15 14:25:22
Line 66 Line 66
 #define OSLANG_EUC  #define OSLANG_EUC
 #define OSLINEBREAK_LF  #define OSLINEBREAK_LF
   
 #if (USE_GTK2 > 0)  
   
 #include <glib.h>  #include <glib.h>
   
 typedef gint32          SINT;  typedef gint32          SINT;
Line 91  typedef gboolean BOOL; Line 89  typedef gboolean BOOL;
 #define PTR_TO_UINT32(p)        ((UINT32)GPOINTER_TO_UINT(p))  #define PTR_TO_UINT32(p)        ((UINT32)GPOINTER_TO_UINT(p))
 #define UINT32_TO_PTR(v)        GUINT_TO_POINTER((UINT32)(v))  #define UINT32_TO_PTR(v)        GUINT_TO_POINTER((UINT32)(v))
   
 #else   /* USE_GTK2 <= 0 */  
   
 typedef signed int              SINT;  
 typedef unsigned int            UINT;  
   
 typedef signed char             SINT8;  
 typedef signed short            SINT16;  
 typedef signed int              SINT32;  
 typedef signed long long        SINT64;  
   
 typedef unsigned char           UINT8;  
 typedef unsigned short          UINT16;  
 typedef unsigned int            UINT32;  
 typedef unsigned long long      UINT64;  
   
 typedef unsigned char           BYTE;  
 typedef char                    TCHAR;  
   
 typedef int                     BOOL;  
   
 #endif  /* USE_GTK2 > 0 */  
   
 #ifndef TRUE  
 #define TRUE    1  
 #endif  
   
 #ifndef FALSE  #ifndef FALSE
 #define FALSE   0  #define FALSE   0
 #endif  #endif
   
   #ifndef TRUE
   #define TRUE    (!FALSE)
   #endif
   
 #ifndef MAX_PATH  #ifndef MAX_PATH
 #define MAX_PATH        MAXPATHLEN  #define MAX_PATH        MAXPATHLEN
 #endif  #endif
Line 179  typedef int   BOOL; Line 155  typedef int   BOOL;
 #endif /* i386 */  #endif /* i386 */
   
 #if defined(__GNUC__)  #if defined(__GNUC__)
 #define GCC_ATTR_PACKED __attribute__((packed))  
 #if defined(NP2_CPU_ARCH_IA32)  #if defined(NP2_CPU_ARCH_IA32)
 #define GCC_CPU_ARCH_IA32  #define GCC_CPU_ARCH_IA32
 #endif  #endif
Line 198  UINT32 gettick(void); Line 173  UINT32 gettick(void);
 #define SPRINTF         sprintf  #define SPRINTF         sprintf
 #define STRLEN          strlen  #define STRLEN          strlen
   
 #define OEMCHAR         char  #define OEMCHAR         gchar
 #define OEMTEXT(s)      s  #define OEMTEXT(s)      s
 #define OEMNULLSTR      OEMTEXT("")  #define OEMNULLSTR      OEMTEXT("")
 #define OEMSPRINTF      sprintf  #define OEMSPRINTF      sprintf
 #define OEMSTRLEN       strlen  #define OEMSTRLEN       strlen
   
 #if defined(CPUCORE_IA32)  #if defined(CPUCORE_IA32)
 void toolkit_msgbox(const char *title, const char *msg);  #define msgbox(title, msg)      toolkit_messagebox(title, msg);
 #define msgbox(title, msg)      toolkit_msgbox(title, msg);  
   
 #define SUPPORT_PC9821  #define SUPPORT_PC9821
 #define SUPPORT_CRT31KHZ  #define SUPPORT_CRT31KHZ
Line 221  void toolkit_msgbox(const char *title, c Line 195  void toolkit_msgbox(const char *title, c
 #define LOADINTELWORD(a)        (*((UINT16 *)(a)))  #define LOADINTELWORD(a)        (*((UINT16 *)(a)))
 #define STOREINTELDWORD(a, b)   *(UINT32 *)(a) = (b)  #define STOREINTELDWORD(a, b)   *(UINT32 *)(a) = (b)
 #define STOREINTELWORD(a, b)    *(UINT16 *)(a) = (b)  #define STOREINTELWORD(a, b)    *(UINT16 *)(a) = (b)
 #if defined(__GNUC__) && defined(IA32_USE_GCC_ATTR_REGPARM)  
 #define GCC_ATTR_REGPARM        __attribute__((regparm(2)))  
 #endif  
 #elif defined(arm) || defined (__arm__)  #elif defined(arm) || defined (__arm__)
 #define MEMOPTIMIZE     2  #define MEMOPTIMIZE     2
 #define REG8            UINT  #define REG8            UINT
Line 247  void toolkit_msgbox(const char *title, c Line 218  void toolkit_msgbox(const char *title, c
 #define SUPPORT_PC9861K  #define SUPPORT_PC9861K
 #define SUPPORT_HOSTDRV  #define SUPPORT_HOSTDRV
   
   #define SUPPORT_RESUME
   #define SUPPORT_STATSAVE
   
 #undef  SUPPORT_SASI  #undef  SUPPORT_SASI
 #undef  SUPPORT_SCSI  #undef  SUPPORT_SCSI
   
 #if (USE_GTK2 > 0)  
 #define SUPPORT_S98  #define SUPPORT_S98
 #define SUPPORT_KEYDISP  #define SUPPORT_KEYDISP
 #define SUPPORT_SOFTKBD 0  #define SUPPORT_SOFTKBD 0
 #endif  
   
 #if (USE_SDL > 0)  #define SUPPORT_SCREENSIZE
 #define USE_SYSMENU  
 #define SCREEN_BPP      16  
 #undef  SUPPORT_8BPP  
 #undef  SUPPORT_24BPP  
 #undef  SUPPORT_32BPP  
 #endif  
   
 #if (USE_SDL > 0) || defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)  #if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #define SUPPORT_JOYSTICK  #define SUPPORT_JOYSTICK
 #define USE_SDL_JOYSTICK  #define USE_SDL_JOYSTICK
 #endif  /* USE_SDL > 0 || USE_SDLAUDIO || USE_SDLMIXER */  #endif  /* USE_SDLAUDIO || USE_SDLMIXER */
   
 /*  /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and   * You could specify a complete path, e.g. "/etc/timidity.cfg", and
Line 282  extern char timidity_cfgfile_path[MAX_PA Line 248  extern char timidity_cfgfile_path[MAX_PA
 #include "rect.h"  #include "rect.h"
 #include "lstarray.h"  #include "lstarray.h"
 #include "trace.h"  #include "trace.h"
   #include "toolkit.h"
   
 #endif  /* NP2_X11_COMPILER_H__ */  #endif  /* NP2_X11_COMPILER_H__ */

Removed from v.1.34  
changed lines
  Added in v.1.39


RetroPC.NET-CVS <cvs@retropc.net>