[BACK]Return to compiler.h CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/compiler.h between versions 1.22 and 1.41

version 1.22, 2004/07/02 14:53:08 version 1.41, 2011/01/15 16:01:52
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 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 */
 #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 85
 #define OSLANG_EUC  #define OSLANG_EUC
 #define OSLINEBREAK_LF  #define OSLINEBREAK_LF
   
 typedef signed char             CHAR;  #include <glib.h>
 typedef signed short            SHORT;  
 typedef signed int              INT;  
 typedef signed long             LONG;  
   
 typedef unsigned char           UCHAR;  
 typedef unsigned short          USHORT;  
 typedef unsigned int            UINT;  
 typedef unsigned long           ULONG;  
   
 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 unsigned short          WORD;  
 typedef unsigned int            DWORD;  
   
 typedef unsigned char           TCHAR;  typedef gint32          SINT;
   typedef guint32         UINT;
   
 typedef int                     BOOL;  typedef gint8           SINT8;
   typedef gint16          SINT16;
   typedef gint32          SINT32;
   typedef gint64          SINT64;
   
 #ifndef TRUE  typedef guint8          UINT8;
 #define TRUE    1  typedef guint16         UINT16;
 #endif  typedef guint32         UINT32;
   typedef guint64         UINT64;
   
   typedef guint8          BYTE;
   typedef gchar           TCHAR;
   
   typedef gboolean        BOOL;
   
   #define PTR_TO_UINT32(p)        ((UINT32)GPOINTER_TO_UINT(p))
   #define UINT32_TO_PTR(v)        GUINT_TO_POINTER((UINT32)(v))
   
 #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 130  typedef int   BOOL; Line 141  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 147  typedef int   BOOL; Line 154  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 163  typedef int   BOOL; Line 170  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 176  typedef int   BOOL; Line 182  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
   #define STRLEN          strlen
   
   #define OEMCHAR         gchar
   #define OEMTEXT(s)      s
   #define OEMNULLSTR      OEMTEXT("")
   #define OEMSPRINTF      sprintf
   #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
   #define SUPPORT_IDEIO
 #else  #else
 #define SUPPORT_CRT15KHZ  #define SUPPORT_CRT15KHZ
 #endif  #endif
Line 197  void toolkit_msgbox(const char *title, c Line 210  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 210  void toolkit_msgbox(const char *title, c Line 220  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 224  void toolkit_msgbox(const char *title, c Line 233  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
 #undef  SUPPORT_IDEIO  
   
 #if USE_GTK > 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  #if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 #undef  SUPPORT_8BPP  #define SUPPORT_JOYSTICK
 #undef  SUPPORT_24BPP  #define USE_SDL_JOYSTICK
 #undef  SUPPORT_32BPP  #endif  /* USE_SDLAUDIO || USE_SDLMIXER */
 #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
Line 255  extern char timidity_cfgfile_path[MAX_PA Line 263  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.22  
changed lines
  Added in v.1.41

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