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

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

version 1.32, 2005/05/21 19:48:15 version 1.35, 2008/02/07 14:37:30
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 gint32          SINT;
 typedef guint32         UINT;  typedef guint32         UINT;
Line 94  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 signed int              SINT;
 typedef unsigned int            UINT;  typedef unsigned int            UINT;
Line 114  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 166  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 182  typedef int   BOOL; Line 179  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 224  void toolkit_msgbox(const char *title, c Line 220  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 253  void toolkit_msgbox(const char *title, c Line 246  void toolkit_msgbox(const char *title, c
 #undef  SUPPORT_SASI  #undef  SUPPORT_SASI
 #undef  SUPPORT_SCSI  #undef  SUPPORT_SCSI
   
 #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 267  void toolkit_msgbox(const char *title, c Line 260  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.32  
changed lines
  Added in v.1.35

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