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.33 and 1.37

version 1.33, 2007/01/20 22:33:06	version 1.37, 2008/03/18 15:45:05
Line 39	Line 39
#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 73	Line 66
#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 gint32 SINT;
typedef guint32 UINT;	typedef guint32 UINT;
Line 98 typedef gboolean BOOL;	Line 89 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 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	#ifndef TRUE
#define TRUE 1	#define TRUE 1
#endif	#endif
Line 170 typedef int BOOL;	Line 139 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 186 typedef int BOOL;	Line 155 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 212 UINT32 gettick(void);	Line 180 UINT32 gettick(void);
#define OEMSTRLEN strlen	#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);

#define SUPPORT_PC9821	#define SUPPORT_PC9821
#define SUPPORT_CRT31KHZ	#define SUPPORT_CRT31KHZ
Line 228 void toolkit_msgbox(const char *title, c	Line 195 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 254 void toolkit_msgbox(const char *title, c	Line 218 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

#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 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 295 extern char timidity_cfgfile_path[MAX_PA	Line 246 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.33
changed lines
	Added in v.1.37