--- np2/x11/compiler.h 2007/01/20 22:33:06 1.33 +++ np2/x11/compiler.h 2011/12/21 18:01:16 1.44 @@ -1,5 +1,3 @@ -/* $Id: compiler.h,v 1.33 2007/01/20 22:33:06 monaka Exp $ */ - /*- * Copyright (c) 2003, 2004 NONAKA Kimihiro * All rights reserved. @@ -33,28 +31,40 @@ #include "config.h" #endif +#ifdef ENABLE_NLS +#include +#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 #define BYTESEX_BIG #else /* !WORDS_BIGENDIAN */ #define BYTESEX_LITTLE #endif /* WORDS_BIGENDIAN */ -#if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__) -#undef USE_NETBSDAUDIO -#endif - -#if !defined(USE_NETBSDAUDIO) && !defined(USE_OSSAUDIO) && !defined(USE_ESDAUDIO) && !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER) +#if !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER) #ifndef NOSOUND #define NOSOUND #undef VERMOUTH_LIB #endif /* !NOSOUND */ -#else /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO || USE_SDLAUDIO || USE_SDLMIXER */ +#else /* USE_SDLAUDIO || USE_SDLMIXER */ #undef NOSOUND #define VERMOUTH_LIB -#if defined(USE_NETBSDAUDIO) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO) -#include -#endif /* USE_NETBSDAUDIO || USE_OSSAUDIO || USE_ESDAUDIO */ -#endif /* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */ +#endif /* !USE_SDLAUDIO && !USE_SDLMIXER */ #include #include @@ -73,9 +83,7 @@ #define OSLANG_EUC #define OSLINEBREAK_LF -#if USE_GTK > 0 || USE_GTK2 > 0 - -#include "glib.h" +#include typedef gint32 SINT; typedef guint32 UINT; @@ -98,36 +106,14 @@ 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 signed int SINT; -typedef unsigned int UINT; - -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 char TCHAR; - -typedef int BOOL; - -#endif /* USE_GTK > 0 || USE_GTK2 > 0 */ - -#ifndef TRUE -#define TRUE 1 -#endif - #ifndef FALSE #define FALSE 0 #endif +#ifndef TRUE +#define TRUE (!FALSE) +#endif + #ifndef MAX_PATH #define MAX_PATH MAXPATHLEN #endif @@ -153,25 +139,8 @@ typedef int BOOL; #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) #endif -#ifndef UNUSED -#define UNUSED(v) ((void)(v)) -#endif - -#define FASTCALL -#define SOUNDCALL -#define MEMCALL -#define CPUCALL - -#ifdef DEBUG -#define INLINE -#define __ASSERT(s) assert(s) -#else -#ifndef __ASSERT -#define __ASSERT(s) -#endif -#ifndef INLINE -#define INLINE __inline -#endif +#ifndef NELEMENTS +#define NELEMENTS(a) ((int)(sizeof(a) / sizeof(a[0]))) #endif /* archtecture */ @@ -186,7 +155,6 @@ typedef int BOOL; #endif /* i386 */ #if defined(__GNUC__) -#define GCC_ATTR_PACKED __attribute__((packed)) #if defined(NP2_CPU_ARCH_IA32) #define GCC_CPU_ARCH_IA32 #endif @@ -195,28 +163,25 @@ typedef int BOOL; #endif #endif /* __GNUC__ */ -#ifndef NELEMENTS -#define NELEMENTS(a) ((int)(sizeof(a) / sizeof(a[0]))) -#endif - UINT32 gettick(void); #define GETTICK() gettick() #define GETRAND() random() #define SPRINTF sprintf #define STRLEN strlen -#define OEMCHAR char +#define OEMCHAR gchar #define OEMTEXT(s) s #define OEMNULLSTR OEMTEXT("") #define OEMSPRINTF sprintf #define OEMSTRLEN strlen #if defined(CPUCORE_IA32) -void toolkit_msgbox(const char *title, const char *msg); -#define msgbox(title, msg) toolkit_msgbox(title, msg); +#define msgbox(title, msg) toolkit_messagebox(title, msg); +#if !defined(DISABLE_PC9821) #define SUPPORT_PC9821 #define SUPPORT_CRT31KHZ +#endif #define SUPPORT_IDEIO #else #define SUPPORT_CRT15KHZ @@ -228,9 +193,9 @@ void toolkit_msgbox(const char *title, c #define LOADINTELWORD(a) (*((UINT16 *)(a))) #define STOREINTELDWORD(a, b) *(UINT32 *)(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 +#if !defined(DEBUG) && !defined(NP2_CPU_ARCH_AMD64) +#define FASTCALL __attribute__((regparm(2))) +#endif /* !DEBUG && !NP2_CPU_ARCH_AMD64 */ #elif defined(arm) || defined (__arm__) #define MEMOPTIMIZE 2 #define REG8 UINT @@ -240,6 +205,31 @@ void toolkit_msgbox(const char *title, c #define MEMOPTIMIZE 1 #endif +#ifndef FASTCALL +#define FASTCALL +#endif +#define CPUCALL FASTCALL +#define MEMCALL FASTCALL +#define DMACCALL FASTCALL +#define IOOUTCALL FASTCALL +#define IOINPCALL FASTCALL +#define SOUNDCALL FASTCALL +#define VRAMCALL FASTCALL +#define SCRNCALL FASTCALL +#define VERMOUTHCL FASTCALL + +#ifdef DEBUG +#define INLINE +#define __ASSERT(s) assert(s) +#else +#ifndef __ASSERT +#define __ASSERT(s) +#endif +#ifndef INLINE +#define INLINE inline +#endif +#endif + #define SUPPORT_EUC #undef SUPPORT_8BPP @@ -254,33 +244,22 @@ void toolkit_msgbox(const char *title, c #define SUPPORT_PC9861K #define SUPPORT_HOSTDRV +#define SUPPORT_RESUME +#define SUPPORT_STATSAVE + #undef SUPPORT_SASI #undef SUPPORT_SCSI -#if USE_GTK > 0 || USE_GTK2 > 0 #define SUPPORT_S98 #define SUPPORT_KEYDISP #define SUPPORT_SOFTKBD 0 -#endif -#if USE_SDL > 0 -#define USE_SYSMENU -#define SCREEN_BPP 16 -#undef SUPPORT_8BPP -#undef SUPPORT_24BPP -#undef SUPPORT_32BPP -#endif +#define SUPPORT_SCREENSIZE -#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO) +#if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER) #define SUPPORT_JOYSTICK - -#if ((USE_SDL > 0) && !defined(NOSOUND)) || defined(USE_SDLAUDIO) #define USE_SDL_JOYSTICK -#else -#error unknown joystick driver!!! -#endif - -#endif +#endif /* USE_SDLAUDIO || USE_SDLMIXER */ /* * You could specify a complete path, e.g. "/etc/timidity.cfg", and @@ -295,5 +274,6 @@ extern char timidity_cfgfile_path[MAX_PA #include "rect.h" #include "lstarray.h" #include "trace.h" +#include "toolkit.h" #endif /* NP2_X11_COMPILER_H__ */