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

Diff for /np2/x11/compiler.h between versions 1.16 and 1.26

version 1.16, 2004/03/25 15:10:33 version 1.26, 2004/07/29 13:06:09
Line 1 Line 1
   /*      $Id$    */
   
   /*-
    * Copyright (c) 2003, 2004 NONAKA Kimihiro
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    *
    * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
    * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
    * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
    * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
    * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    * SUCH DAMAGE.
    */
   
 #ifndef NP2_X11_COMPILER_H__  #ifndef NP2_X11_COMPILER_H__
 #define NP2_X11_COMPILER_H__  #define NP2_X11_COMPILER_H__
   
Line 14 Line 42
 #if !defined(USE_NETBSDAUDIO) && !defined(USE_OSSAUDIO) && !defined(USE_ESDAUDIO) && !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER)  #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
 #endif  /* !NOSOUND */  #endif  /* !NOSOUND */
 #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
 #endif  /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */  
   
 #if defined(NOSOUND)  
   
 #undef  VERMOUTH_LIB  
 #undef  SOUND_CRITICAL  
 #undef  SOUNDRESERVE  
   
 #else   /* !NOSOUND */  
   
 #include <pthread.h>  
   
 #define VERMOUTH_LIB  #define VERMOUTH_LIB
 #undef  SOUND_CRITICAL  #if defined(USE_NETBSDAUDIO) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO)
 #undef  SOUNDRESERVE  #include <pthread.h>
   #endif  /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO */
 #endif  /* NOSOUND */  #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 52 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;
   
   #define PTR_TO_UINT32(p)        ((UINT32)GPOINTER_TO_UINT(p))
   #define UINT32_TO_PTR(v)        GUINT_TO_POINTER((UINT32)(v))
   
   #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 73  typedef unsigned int  UINT32; Line 108  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 134  typedef int   BOOL; Line 168  typedef int   BOOL;
 #endif  #endif
 #endif  #endif
   
   /* archtecture */
   /* amd64 */
   #if defined(amd64) || defined(__AMD64__) || defined(__amd64__) || \
       defined(x86_64) || defined(__x86_64__) || defined(__X86_64__)
   #define NP2_CPU_ARCH_AMD64
   #endif /* amd64 */
   /* i386 */
   #if defined(i386) || defined(__i386__) || defined(NP2_CPU_ARCH_AMD64)
   #define NP2_CPU_ARCH_IA32
   #endif /* i386 */
   
 #if defined(__GNUC__)  #if defined(__GNUC__)
 #define GCC_ATTR_PACKED __attribute__((packed))  #define GCC_ATTR_PACKED __attribute__((packed))
   #if defined(NP2_CPU_ARCH_IA32)
   #define GCC_CPU_ARCH_IA32
   #endif
   #if defined(NP2_CPU_ARCH_AMD64)
   #define GCC_CPU_ARCH_AMD64
 #endif  #endif
   #endif /* __GNUC__ */
   
 #ifndef NELEMENTS  #ifndef NELEMENTS
 #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 150  UINT32 gettick(); Line 201  UINT32 gettick();
 #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
Line 157  void toolkit_msgbox(const char *title, c Line 211  void toolkit_msgbox(const char *title, c
 #define SUPPORT_CRT15KHZ  #define SUPPORT_CRT15KHZ
 #endif  #endif
   
 #if defined(i386) || defined(__i386__)  #if defined(NP2_CPU_ARCH_IA32)
 #undef  MEMOPTIMIZE  #undef  MEMOPTIMIZE
 #define LOADINTELDWORD(a)       (*((UINT32 *)(a)))  #define LOADINTELDWORD(a)       (*((UINT32 *)(a)))
 #define LOADINTELWORD(a)        (*((UINT16 *)(a)))  #define LOADINTELWORD(a)        (*((UINT16 *)(a)))
Line 176  void toolkit_msgbox(const char *title, c Line 230  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 183  void toolkit_msgbox(const char *title, c Line 238  void toolkit_msgbox(const char *title, c
 #define SUPPORT_32BPP  #define SUPPORT_32BPP
 #define SUPPORT_NORMALDISP  #define SUPPORT_NORMALDISP
   
   #undef  SOUND_CRITICAL
   #undef  SOUNDRESERVE
   
 #define SUPPORT_PC9861K  #define SUPPORT_PC9861K
 #define SUPPORT_HOSTDRV  #define SUPPORT_HOSTDRV
   
 #undef  SUPPORT_SASI  #undef  SUPPORT_SASI
 #undef  SUPPORT_SCSI  #undef  SUPPORT_SCSI
 #undef  SUPPORT_IDE  #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
 #endif  #endif
   
 #if USE_SDL > 0  #if USE_SDL > 0
Line 203  void toolkit_msgbox(const char *title, c Line 262  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.16  
changed lines
  Added in v.1.26

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