--- np2/x11/compiler.h 2004/07/26 15:53:26 1.24 +++ np2/x11/compiler.h 2005/03/23 13:43:23 1.30 @@ -1,4 +1,4 @@ -/* $Id: compiler.h,v 1.24 2004/07/26 15:53:26 monaka Exp $ */ +/* $Id: compiler.h,v 1.30 2005/03/23 13:43:23 monaka Exp $ */ /*- * Copyright (c) 2003, 2004 NONAKA Kimihiro @@ -90,6 +90,9 @@ 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 int UINT; @@ -194,6 +197,13 @@ UINT32 gettick(void); #define GETTICK() gettick() #define GETRAND() random() #define SPRINTF sprintf +#define STRLEN strlen + +#define OEMCHAR char +#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); @@ -201,6 +211,7 @@ void toolkit_msgbox(const char *title, c #define SUPPORT_PC9821 #define SUPPORT_CRT31KHZ +#define SUPPORT_IDEIO #else #define SUPPORT_CRT15KHZ #endif @@ -240,7 +251,6 @@ void toolkit_msgbox(const char *title, c #undef SUPPORT_SASI #undef SUPPORT_SCSI -#undef SUPPORT_IDEIO #if USE_GTK > 0 || USE_GTK2 > 0 #define SUPPORT_S98