Diff for /np2/x11/compiler.h between versions 1.35 and 1.42

version 1.35, 2008/02/07 14:37:30 version 1.42, 2011/01/15 18:43:13
Line 1 Line 1
 /*      $Id$    */  
   
 /*-  /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro   * Copyright (c) 2003, 2004 NONAKA Kimihiro
  * All rights reserved.   * All rights reserved.
Line 33 Line 31
 #include "config.h"  #include "config.h"
 #endif  #endif
   
   #ifdef ENABLE_NLS
   #include <libintl.h>
   #define _(s)                            gettext(s)
   #ifdef gettext_noop
   #define N_(s)                           gettext_noop(s)
   #else
   #define N_(s)                           (s)
   #endif
   #else /* !ENABLE_NLS */
   #define _(s)                            (s)
   #define N_(s) (s)
   #define textdomain(s)                   (s)
   #define gettext(s)                      (s)
   #define dgettext(d,s)                   (s)
   #define dcgettext(d,s,t)                (s)
   #define bindtextdomain(d,dir)           (d)
   #define bind_textdomain_codeset(d,c)    (c)
   #endif /* ENABLE_NLS */
   
 #ifdef  WORDS_BIGENDIAN  #ifdef  WORDS_BIGENDIAN
 #define BYTESEX_BIG  #define BYTESEX_BIG
 #else   /* !WORDS_BIGENDIAN */  #else   /* !WORDS_BIGENDIAN */
Line 66 Line 83
 #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 106  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 146  typedef int   BOOL; Line 139  typedef int   BOOL;
 #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))  #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
 #endif  #endif
   
 #ifndef UNUSED  
 #define UNUSED(v)       ((void)(v))  
 #endif  
   
 #define FASTCALL  #define FASTCALL
 #define SOUNDCALL  #define SOUNDCALL
 #define MEMCALL  #define MEMCALL
Line 197  UINT32 gettick(void); Line 186  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 243  void toolkit_msgbox(const char *title, c Line 231  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 278  extern char timidity_cfgfile_path[MAX_PA Line 261  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.35  
changed lines
  Added in v.1.42


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