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

version 1.27, 2005/02/26 13:32:14 version 1.34, 2007/01/23 15:48:20
Line 29 Line 29
 #ifndef NP2_X11_COMPILER_H__  #ifndef NP2_X11_COMPILER_H__
 #define NP2_X11_COMPILER_H__  #define NP2_X11_COMPILER_H__
   
   #ifdef HAVE_CONFIG_H
   #include "config.h"
   #endif
   
 #ifdef  WORDS_BIGENDIAN  #ifdef  WORDS_BIGENDIAN
 #define BYTESEX_BIG  #define BYTESEX_BIG
 #else   /* !WORDS_BIGENDIAN */  #else   /* !WORDS_BIGENDIAN */
 #define BYTESEX_LITTLE  #define BYTESEX_LITTLE
 #endif  /* WORDS_BIGENDIAN */  #endif  /* WORDS_BIGENDIAN */
   
 #if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__)  #if !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)
 #undef  USE_NETBSDAUDIO  
 #endif  
   
 #if !defined(USE_NETBSDAUDIO) && !defined(USE_OSSAUDIO) && !defined(USE_ESDAUDIO) && !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)  
 #ifndef NOSOUND  #ifndef NOSOUND
 #define NOSOUND  #define NOSOUND
 #undef  VERMOUTH_LIB  #undef  VERMOUTH_LIB
 #endif  /* !NOSOUND */  #endif  /* !NOSOUND */
 #else   /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */  #else   /* USE_SDLAUDIO || USE_SDLMIXER */
 #undef  NOSOUND  #undef  NOSOUND
 #define VERMOUTH_LIB  #define VERMOUTH_LIB
 #if defined(USE_NETBSDAUDIO) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO)  #endif  /* !USE_SDLAUDIO && !USE_SDLMIXER */
 #include <pthread.h>  
 #endif  /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO */  
 #endif  /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */  
   
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/time.h>  #include <sys/time.h>
Line 69 Line 66
 #define OSLANG_EUC  #define OSLANG_EUC
 #define OSLINEBREAK_LF  #define OSLINEBREAK_LF
   
 #if USE_GTK > 0 || USE_GTK2 > 0  #if (USE_GTK2 > 0)
   
 #include "glib.h"  #include <glib.h>
   
   typedef gint32          SINT;
 typedef guint32         UINT;  typedef guint32         UINT;
   
 typedef gint8           SINT8;  typedef gint8           SINT8;
Line 93  typedef gboolean BOOL; Line 91  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_GTK == 0 && USE_GTK2 == 0 */  #else   /* USE_GTK2 <= 0 */
   
   typedef signed int              SINT;
 typedef unsigned int            UINT;  typedef unsigned int            UINT;
   
 typedef signed char             SINT8;  typedef signed char             SINT8;
Line 112  typedef char   TCHAR; Line 111  typedef char   TCHAR;
   
 typedef int                     BOOL;  typedef int                     BOOL;
   
 #endif  /* USE_GTK > 0 || USE_GTK2 > 0 */  #endif  /* USE_GTK2 > 0 */
   
 #ifndef TRUE  #ifndef TRUE
 #define TRUE    1  #define TRUE    1
Line 164  typedef int   BOOL; Line 163  typedef int   BOOL;
 #define __ASSERT(s)  #define __ASSERT(s)
 #endif  #endif
 #ifndef INLINE  #ifndef INLINE
 #define INLINE          __inline  #define INLINE          inline
 #endif  #endif
 #endif  #endif
   
Line 198  UINT32 gettick(void); Line 197  UINT32 gettick(void);
 #define GETRAND()       random()  #define GETRAND()       random()
 #define SPRINTF         sprintf  #define SPRINTF         sprintf
 #define STRLEN          strlen  #define STRLEN          strlen
   
   #define OEMCHAR         char
   #define OEMTEXT(s)      s
   #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);  void toolkit_msgbox(const char *title, const char *msg);
 #define msgbox(title, msg)      toolkit_msgbox(title, msg);  #define msgbox(title, msg)      toolkit_msgbox(title, msg);
 #ifndef IA32_PAGING_EACHSIZE  
 #define IA32_PAGING_EACHSIZE  
 #endif  
   
 #define SUPPORT_PC9821  #define SUPPORT_PC9821
 #define SUPPORT_CRT31KHZ  #define SUPPORT_CRT31KHZ
   #define SUPPORT_IDEIO
 #else  #else
 #define SUPPORT_CRT15KHZ  #define SUPPORT_CRT15KHZ
 #endif  #endif
Line 233  void toolkit_msgbox(const char *title, c Line 234  void toolkit_msgbox(const char *title, c
 #endif  #endif
   
 #define SUPPORT_EUC  #define SUPPORT_EUC
 #define SUPPORT_SJIS  
   
 #undef  SUPPORT_8BPP  #undef  SUPPORT_8BPP
 #define SUPPORT_16BPP  #define SUPPORT_16BPP
Line 249  void toolkit_msgbox(const char *title, c Line 249  void toolkit_msgbox(const char *title, c
   
 #undef  SUPPORT_SASI  #undef  SUPPORT_SASI
 #undef  SUPPORT_SCSI  #undef  SUPPORT_SCSI
 #undef  SUPPORT_IDEIO  
   
 #if USE_GTK > 0 || USE_GTK2 > 0  #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  #endif
   
 #if USE_SDL > 0  #if (USE_SDL > 0)
 #define USE_SYSMENU  #define USE_SYSMENU
 #define SCREEN_BPP      16  #define SCREEN_BPP      16
 #undef  SUPPORT_8BPP  #undef  SUPPORT_8BPP
Line 265  void toolkit_msgbox(const char *title, c Line 264  void toolkit_msgbox(const char *title, c
 #undef  SUPPORT_32BPP  #undef  SUPPORT_32BPP
 #endif  #endif
   
 #if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)  #if (USE_SDL > 0) || defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #define SUPPORT_JOYSTICK  #define SUPPORT_JOYSTICK
   
 #if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)  
 #define USE_SDL_JOYSTICK  #define USE_SDL_JOYSTICK
 #else  #endif  /* USE_SDL > 0 || USE_SDLAUDIO || USE_SDLMIXER */
 #error  unknown joystick driver!!!  
 #endif  
   
 #endif  
   
 /*  /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and   * You could specify a complete path, e.g. "/etc/timidity.cfg", and

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


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