--- np2/x11/np2.h	2003/12/19 16:08:01	1.5
+++ np2/x11/np2.h	2004/06/16 12:50:49	1.10
@@ -32,6 +32,7 @@ typedef struct {
 	BYTE	JOY1BTN[4];
 
 	COMCFG	mpu;
+	COMCFG	com[3];
 
 	BYTE	confirm;
 
@@ -40,7 +41,9 @@ typedef struct {
 	BYTE	statsave;
 	BYTE	toolwin;
 	BYTE	keydisp;
+	BYTE	softkbd;
 	BYTE	hostdrv_write;
+	BYTE	jastsnd;
 	BYTE	I286SAVE;
 
 	BYTE	snddrv;
@@ -94,6 +97,7 @@ extern char bmpfilefolder[MAX_PATH];
 extern char modulefile[MAX_PATH];
 extern char statpath[MAX_PATH];
 extern char fontname[1024];
+extern char fontfilename[MAX_PATH];
 
 int flagload(const char* ext, const char* title, BOOL force);
 int flagsave(const char* ext);
@@ -104,7 +108,7 @@ void framereset(UINT cnt);
 void processwait(UINT cnt);
 int mainloop(void *);
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 extern int mmxflag;
 int havemmx(void);
 #endif