Diff for /np2/x11/compiler.h between versions 1.21 and 1.24

version 1.21, 2004/06/17 14:36:33 version 1.24, 2004/07/26 15:53:26
Line 47 Line 47
 #else   /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */  #else   /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */
 #undef  NOSOUND  #undef  NOSOUND
 #define VERMOUTH_LIB  #define VERMOUTH_LIB
   #if defined(USE_NETBSDAUDIO) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO)
   #include <pthread.h>
   #endif  /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO */
 #endif  /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */  #endif  /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
   
 #include <sys/param.h>  #include <sys/param.h>
Line 66 Line 69
 #define OSLANG_EUC  #define OSLANG_EUC
 #define OSLINEBREAK_LF  #define OSLINEBREAK_LF
   
 typedef signed char             CHAR;  #if USE_GTK > 0 || USE_GTK2 > 0
 typedef signed short            SHORT;  
 typedef signed int              INT;  #include "glib.h"
 typedef signed long             LONG;  
   typedef guint32         UINT;
   
   typedef gint8           SINT8;
   typedef gint16          SINT16;
   typedef gint32          SINT32;
   typedef gint64          SINT64;
   
   typedef guint8          UINT8;
   typedef guint16         UINT16;
   typedef guint32         UINT32;
   typedef guint64         UINT64;
   
   typedef guint8          BYTE;
   typedef gchar           TCHAR;
   
   typedef gboolean        BOOL;
   
   #else   /* USE_GTK == 0 && USE_GTK2 == 0 */
   
 typedef unsigned char           UCHAR;  
 typedef unsigned short          USHORT;  
 typedef unsigned int            UINT;  typedef unsigned int            UINT;
 typedef unsigned long           ULONG;  
   
 typedef signed char             SINT8;  typedef signed char             SINT8;
 typedef signed short            SINT16;  typedef signed short            SINT16;
Line 87  typedef unsigned int  UINT32; Line 105  typedef unsigned int  UINT32;
 typedef unsigned long long      UINT64;  typedef unsigned long long      UINT64;
   
 typedef unsigned char           BYTE;  typedef unsigned char           BYTE;
 typedef unsigned short          WORD;  typedef char                    TCHAR;
 typedef unsigned int            DWORD;  
   
 typedef unsigned char           TCHAR;  
   
 typedef int                     BOOL;  typedef int                     BOOL;
   
   #endif  /* USE_GTK > 0 || USE_GTK2 > 0 */
   
 #ifndef TRUE  #ifndef TRUE
 #define TRUE    1  #define TRUE    1
 #endif  #endif
Line 173  typedef int   BOOL; Line 190  typedef int   BOOL;
 #define NELEMENTS(a)    ((int)(sizeof(a) / sizeof(a[0])))  #define NELEMENTS(a)    ((int)(sizeof(a) / sizeof(a[0])))
 #endif  #endif
   
 UINT32 gettick();  UINT32 gettick(void);
 #define GETTICK()       gettick()  #define GETTICK()       gettick()
 #define GETRAND()       random()  #define GETRAND()       random()
 #define SPRINTF         sprintf  #define SPRINTF         sprintf
Line 225  void toolkit_msgbox(const char *title, c Line 242  void toolkit_msgbox(const char *title, c
 #undef  SUPPORT_SCSI  #undef  SUPPORT_SCSI
 #undef  SUPPORT_IDEIO  #undef  SUPPORT_IDEIO
   
 #if USE_GTK > 0  #if USE_GTK > 0 || USE_GTK2 > 0
 #define SUPPORT_S98  #define SUPPORT_S98
 #define SUPPORT_KEYDISP  #define SUPPORT_KEYDISP
 #define SUPPORT_SOFTKBD 0  #define SUPPORT_SOFTKBD 0
Line 239  void toolkit_msgbox(const char *title, c Line 256  void toolkit_msgbox(const char *title, c
 #undef  SUPPORT_32BPP  #undef  SUPPORT_32BPP
 #endif  #endif
   
   #if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
   #define SUPPORT_JOYSTICK
   
   #if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO)
   #define USE_SDL_JOYSTICK
   #else
   #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
  * then specify the library directory in the configuration file.   * then specify the library directory in the configuration file.

Removed from v.1.21  
changed lines
  Added in v.1.24


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