--- tmview-01.03.orig/lX/defslx.h
+++ tmview-01.03/lX/defslx.h
@@ -14,6 +14,7 @@
 */
 
 #define _GNU_SOURCE  
+#define HAVE_PROTOTYPES
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -142,8 +143,6 @@
 
 
 /* be careful with storge types !!! */
-#define BMLONG32     /* when "long int" has 32bits, e.g. i386 architecture */
-/*#define BMLONG64 *//* when "long int" has 64bits, e.g. alpha architecture*/
 /*#define GREYINBMU*//* waste memory. may be a bit faster    */
 #define COLORS_PER_GREY 16 /* 2^BITS_PER_GREY, no MECK-like things in lX  */
 
--- tmview-01.03.orig/src/tmview.c
+++ tmview-01.03/src/tmview.c
@@ -2335,14 +2335,6 @@
   pfprot("This is some kind of a DVIewer, %s\n",MYVERSION);
   pfprot("(C)opyright 1995 Thomas Moor\n\n");
 
-  /* check some arcitecture dependant stuff ... better be configured */ 
-  if(BYTES_PER_BMUNIT !=sizeof(BMUNIT)){
-    pfprot("This message addresses the administrator rather than the user:\n");
-    pfprot("the compiletime option BMLONG64/BMLONG32 seems not to meet your\n");
-    pfprot("machines architecture. Please check the non-i386 section in the\n");
-    pfprot("README and re-compile. Sorry.\n\n");
-    exit(1);
-  }
   if(sizeof(void*)<sizeof(long)){ /* this is for the lru-buffer in subs.c*/
     pfprot("This message addresses the administrator rather than the user:\n");
     pfprot("sizeof \"void*\" is assumed to be at least the size of \"long int\".");
--- tmview-01.03.orig/src/defsgen.h
+++ tmview-01.03/src/defsgen.h
@@ -189,18 +189,18 @@
 */
 
 
-#ifdef	BMLONG64
+#if __WORDSIZE == 64
 #define	BMUNIT			unsigned long
 #define	BITS_PER_BMUNIT		64
 #define BITS_LOG2               6
 #define	BYTES_PER_BMUNIT	8
-#endif
-#ifdef	BMLONG32
+#else
 #define	BMUNIT			unsigned long
 #define	BITS_PER_BMUNIT		32
 #define BITS_LOG2               5
 #define	BYTES_PER_BMUNIT	4
 #endif
+
 #ifdef BMCHAR
 #define BMUNIT                  unsigned char
 #define	BITS_PER_BMUNIT		8
--- tmview-01.03.orig/svga/defssvga.h
+++ tmview-01.03/svga/defssvga.h
@@ -14,6 +14,7 @@
 */
 
 #define _GNU_SOURCE  
+#define HAVE_PROTOTYPES
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -176,8 +177,6 @@
 */
 
 /* be careful with storge types !!! */
-#define BMLONG32       /* for architectures where "long int" has 32bits, e.g. i386  */
-/* #define BMLONG64  *//* for architectures where "long int" has 64bits, e.g. alpha */
 /* #define GREYINBMU *//* waste memory. may be a bit faster    */
 
 /* if DOSFILES is defined, a dosfilesystem is expected, */ 
--- tmview-01.03.orig/fb/defsfb.h
+++ tmview-01.03/fb/defsfb.h
@@ -14,6 +14,7 @@
 */
 
 #define _GNU_SOURCE  
+#define HAVE_PROTOTYPES
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -144,8 +145,6 @@
 */
 
 /* be careful with storge types !!! */
-#define BMLONG32       /* for architectures where "long int" has 32bits, e.g. i386  */
-/* #define BMLONG64  *//* for architectures where "long int" has 64bits, e.g. alpha */
 /* #define GREYINBMU *//* waste memory. may be a bit faster    */
 
 /* if DOSFILES is defined, a dosfilesystem is expected, */