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

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

version 1.18, 2004/05/22 16:35:07 version 1.21, 2004/06/17 14:36:33
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  #endif  /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
 #undef  SOUNDRESERVE  
   
 #endif  /* NOSOUND */  
   
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/time.h>  #include <sys/time.h>
Line 136  typedef int   BOOL; Line 150  typedef int   BOOL;
   
 /* archtecture */  /* archtecture */
 /* amd64 */  /* amd64 */
 #if defined(amd64) || defined(__AMD64__) || defined(__amd64__)) ||  #if defined(amd64) || defined(__AMD64__) || defined(__amd64__) || \
     defined(x86_64) || defined(__x86_64__) || defined(__X86_64__)      defined(x86_64) || defined(__x86_64__) || defined(__X86_64__)
 #define NP2_CPU_ARCH_AMD64  #define NP2_CPU_ARCH_AMD64
 #endif /* amd64 */  #endif /* amd64 */
Line 201  void toolkit_msgbox(const char *title, c Line 215  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
 #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
Removed from v.1.18  
changed lines
  Added in v.1.21

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