Attachment #50403 for bug #80815




++ tmview-01.03/lX/defslx.h

*/

#define _GNU_SOURCE  
#define HAVE_PROTOTYPES

#include <sys/types.h>
#include <sys/time.h>



/* 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/src/tmview.c

  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/src/defsgen.h

*/


#if __WORDSIZE == 64
#define	BMUNIT			unsigned long
#define	BITS_PER_BMUNIT		64
#define BITS_LOG2               6
#define	BYTES_PER_BMUNIT	8
#else
#ifdef	BMLONG32
#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/svga/defssvga.h

*/

#define _GNU_SOURCE  
#define HAVE_PROTOTYPES

#include <sys/types.h>
#include <sys/time.h>

*/

/* 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/fb/defsfb.h

*/

#define _GNU_SOURCE  
#define HAVE_PROTOTYPES

#include <sys/types.h>
#include <sys/time.h>

*/

/* 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, */ 

Return to bug 80815

Line Link Here

(-)file_not_specified_in_diff (-22 / +11 lines)
0	-- tmview-01.03.orig/lX/defslx.h	0	++ tmview-01.03/lX/defslx.h
Lines 14-19 Link Here
14	*/	14	*/
15		15
16	#define _GNU_SOURCE	16	#define _GNU_SOURCE
		17	#define HAVE_PROTOTYPES
17		18
18	#include <sys/types.h>	19	#include <sys/types.h>
19	#include <sys/time.h>	20	#include <sys/time.h>
Lines 142-149 Link Here
142		143
143		144
144	/* be careful with storge types !!! */	145	/* be careful with storge types !!! */
145	#define BMLONG32 /* when "long int" has 32bits, e.g. i386 architecture */
146	/#define BMLONG64 //* when "long int" has 64bits, e.g. alpha architecture*/
147	/#define GREYINBMU//* waste memory. may be a bit faster */	146	/#define GREYINBMU//* waste memory. may be a bit faster */
148	#define COLORS_PER_GREY 16 /* 2^BITS_PER_GREY, no MECK-like things in lX */	147	#define COLORS_PER_GREY 16 /* 2^BITS_PER_GREY, no MECK-like things in lX */
149		148
150	-- tmview-01.03.orig/src/tmview.c	149	++ tmview-01.03/src/tmview.c
Lines 2335-2348 Link Here
2335	pfprot("This is some kind of a DVIewer, %s\n",MYVERSION);	2335	pfprot("This is some kind of a DVIewer, %s\n",MYVERSION);
2336	pfprot("(C)opyright 1995 Thomas Moor\n\n");	2336	pfprot("(C)opyright 1995 Thomas Moor\n\n");
2337		2337
2338	/* check some arcitecture dependant stuff ... better be configured */
2339	if(BYTES_PER_BMUNIT !=sizeof(BMUNIT)){
2340	pfprot("This message addresses the administrator rather than the user:\n");
2341	pfprot("the compiletime option BMLONG64/BMLONG32 seems not to meet your\n");
2342	pfprot("machines architecture. Please check the non-i386 section in the\n");
2343	pfprot("README and re-compile. Sorry.\n\n");
2344	exit(1);
2345	}
2346	if(sizeof(void)<sizeof(long)){ / this is for the lru-buffer in subs.c*/	2338	if(sizeof(void)<sizeof(long)){ / this is for the lru-buffer in subs.c*/
2347	pfprot("This message addresses the administrator rather than the user:\n");	2339	pfprot("This message addresses the administrator rather than the user:\n");
2348	pfprot("sizeof \"void*\" is assumed to be at least the size of \"long int\".");	2340	pfprot("sizeof \"void*\" is assumed to be at least the size of \"long int\".");
2349	-- tmview-01.03.orig/src/defsgen.h	2341	++ tmview-01.03/src/defsgen.h
Lines 189-206 Link Here
189	*/	189	*/
190		190
191		191
192	#ifdef BMLONG64	192	#if __WORDSIZE == 64
193	#define BMUNIT unsigned long	193	#define BMUNIT unsigned long
194	#define BITS_PER_BMUNIT 64	194	#define BITS_PER_BMUNIT 64
195	#define BITS_LOG2 6	195	#define BITS_LOG2 6
196	#define BYTES_PER_BMUNIT 8	196	#define BYTES_PER_BMUNIT 8
197	#endif	197	#else
198	#ifdef BMLONG32
199	#define BMUNIT unsigned long	198	#define BMUNIT unsigned long
200	#define BITS_PER_BMUNIT 32	199	#define BITS_PER_BMUNIT 32
201	#define BITS_LOG2 5	200	#define BITS_LOG2 5
202	#define BYTES_PER_BMUNIT 4	201	#define BYTES_PER_BMUNIT 4
203	#endif	202	#endif
		203
204	#ifdef BMCHAR	204	#ifdef BMCHAR
205	#define BMUNIT unsigned char	205	#define BMUNIT unsigned char
206	#define BITS_PER_BMUNIT 8	206	#define BITS_PER_BMUNIT 8
207	-- tmview-01.03.orig/svga/defssvga.h	207	++ tmview-01.03/svga/defssvga.h
Lines 14-19 Link Here
14	*/	14	*/
15		15
16	#define _GNU_SOURCE	16	#define _GNU_SOURCE
		17	#define HAVE_PROTOTYPES
17		18
18	#include <sys/types.h>	19	#include <sys/types.h>
19	#include <sys/time.h>	20	#include <sys/time.h>
Lines 176-183 Link Here
176	*/	177	*/
177		178
178	/* be careful with storge types !!! */	179	/* be careful with storge types !!! */
179	#define BMLONG32 /* for architectures where "long int" has 32bits, e.g. i386 */
180	/* #define BMLONG64 // for architectures where "long int" has 64bits, e.g. alpha */
181	/* #define GREYINBMU // waste memory. may be a bit faster */	180	/* #define GREYINBMU // waste memory. may be a bit faster */
182		181
183	/* if DOSFILES is defined, a dosfilesystem is expected, */	182	/* if DOSFILES is defined, a dosfilesystem is expected, */
184	-- tmview-01.03.orig/fb/defsfb.h	183	++ tmview-01.03/fb/defsfb.h
Lines 14-19 Link Here
14	*/	14	*/
15		15
16	#define _GNU_SOURCE	16	#define _GNU_SOURCE
		17	#define HAVE_PROTOTYPES
17		18
18	#include <sys/types.h>	19	#include <sys/types.h>
19	#include <sys/time.h>	20	#include <sys/time.h>
Lines 144-151 Link Here
144	*/	145	*/
145		146
146	/* be careful with storge types !!! */	147	/* be careful with storge types !!! */
147	#define BMLONG32 /* for architectures where "long int" has 32bits, e.g. i386 */
148	/* #define BMLONG64 // for architectures where "long int" has 64bits, e.g. alpha */
149	/* #define GREYINBMU // waste memory. may be a bit faster */	148	/* #define GREYINBMU // waste memory. may be a bit faster */
150		149
151	/* if DOSFILES is defined, a dosfilesystem is expected, */	150	/* if DOSFILES is defined, a dosfilesystem is expected, */