np2/x11/compiler.h - diff

Return to compiler.h CVS log

Up to [RetroPC.NET] / np2 / x11

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

version 1.26, 2004/07/29 13:06:09	version 1.42, 2011/01/15 18:43:13
Line 1	Line 1
/* $Id$ */

/*-	/*-
* Copyright (c) 2003, 2004 NONAKA Kimihiro	* Copyright (c) 2003, 2004 NONAKA Kimihiro
* All rights reserved.	* All rights reserved.
Line 29	Line 27
#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 83
#define OSLANG_EUC	#define OSLANG_EUC
#define OSLINEBREAK_LF	#define OSLINEBREAK_LF

#if USE_GTK > 0 \|\| USE_GTK2 > 0	#include <glib.h>

#include "glib.h"

	typedef gint32 SINT;
typedef guint32 UINT;	typedef guint32 UINT;

typedef gint8 SINT8;	typedef gint8 SINT8;
Line 93 typedef gboolean BOOL;	Line 106 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 */

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	#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 147 typedef int BOOL;	Line 139 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 164 typedef int BOOL;	Line 152 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 180 typedef int BOOL;	Line 168 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 197 UINT32 gettick(void);	Line 184 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);
#ifndef IA32_PAGING_EACHSIZE
#define IA32_PAGING_EACHSIZE
#endif

#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 217 void toolkit_msgbox(const char *title, c	Line 208 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 230 void toolkit_msgbox(const char *title, c	Line 218 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 244 void toolkit_msgbox(const char *title, c	Line 231 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 \|\| USE_GTK2 > 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
#undef SUPPORT_8BPP
#undef SUPPORT_24BPP
#undef SUPPORT_32BPP
#endif

#if ((USE_SDL > 0) && !defined(NOSOUND)) \|\| defined(USE_SDLAUDIO)	#if 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_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
Line 286 extern char timidity_cfgfile_path[MAX_PA	Line 261 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__ */

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

Removed from v.1.26
changed lines
	Added in v.1.42