Do not use '#endif/#else xxx'; it is not allowed for ANSI C

1991-12-17 15:28:58 +00:00
parent 53c4951b29
commit df1ed9426d
67 changed files with 306 additions and 298 deletions
--- a/util/int/alloc.c
+++ b/util/int/alloc.c
@@ -29,7 +29,7 @@ char *Malloc(sz, descr)
 			}
 		}
 	}
-#endif	DB_MALLOC
+#endif	/* DB_MALLOC */

 	return new;
 }
--- a/util/int/core.c
+++ b/util/int/core.c
@@ -67,7 +67,7 @@ core_dump()
 	fwrite(FRA_sh, 1, (int)(FRALimit), core_file);
 	fwrite(data_sh, 1, (int)(HL), core_file);
 	fwrite(stack_sh, 1, (int)(ML+1-SL), core_file);
-#endif	LOGGING
+#endif	/* LOGGING */
 	
 	fclose(core_file);
 	core_file = 0;
--- a/util/int/data.c
+++ b/util/int/data.c
@@ -22,7 +22,7 @@ extern size maxheap;			/* from main.c */

 #ifdef	LOGGING
 char *data_sh;				/* shadowbytes */
-#endif	LOGGING
+#endif	/* LOGGING */

 PRIVATE warn_dtbits();

@@ -37,7 +37,7 @@ init_data(hb)
 #ifdef	LOGGING
 	data_sh = Malloc((size)p2i(HL), "shadowspace for data");
 	dt_clear_area(i2p(0), HL);
-#endif	LOGGING
+#endif	/* LOGGING */
 }


@@ -77,14 +77,14 @@ newHP(ap)
 #ifdef	LOGGING
 		data_sh = Realloc(data_sh, (size)(p2i(HL) + 1),
 						"shadowspace for heap");
-#endif	LOGGING
+#endif	/* LOGGING */
 	}

 #ifdef	LOGGING
 	if (p > HP) {
 		dt_clear_area(HP, p);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */
 	HP = p;
 }

@@ -145,7 +145,7 @@ dt_stn(addr, al, n)
 #ifdef LOGGING
 	/* a psize zero is ambiguous */
 	int sh_flags = (l == 0 && n == psize) ? (SH_INT|SH_DATAP) : SH_INT;
-#endif LOGGING
+#endif /* LOGGING */

 	LOG(("@g6 dt_stn(%lu, %lu, %lu)", addr, l, n));
 	ch_in_data(addr, n);
@@ -155,7 +155,7 @@ dt_stn(addr, al, n)
 		data_loc(addr) = (char) l;
 #ifdef LOGGING
 		dt_sh(addr) = sh_flags;
-#endif	LOGGING
+#endif	/* LOGGING */
 		l = l>>8;
 	}
 }
@@ -169,7 +169,7 @@ dt_stw(addr, al)
 #ifdef LOGGING
 	/* a psize zero is ambiguous */
 	int sh_flags = (l == 0 && wsize == psize) ? (SH_INT|SH_DATAP) : SH_INT;
-#endif LOGGING
+#endif /* LOGGING */

 	LOG(("@g6 dt_stw(%lu, %lu)", addr, l));
 	ch_in_data(addr, wsize);
@@ -179,7 +179,7 @@ dt_stw(addr, al)
 		data_loc(addr) = (char) l;
 #ifdef LOGGING
 		dt_sh(addr) = sh_flags;
-#endif	LOGGING
+#endif	/* LOGGING */
 		l = l>>8;
 	}
 }
@@ -207,7 +207,7 @@ dt_stf(addr, f, n)
 		dt_fl(addr);
 	}
 }
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 /************************************************************************
 *	Data load division.						*
@@ -236,7 +236,7 @@ ptr dt_lddp(addr)
 		warning(WGDPEXP);
 		warn_dtbits(addr, psize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	p = p_in_data(addr);
 	LOG(("@g6 dt_lddp() returns %lu", p));
@@ -257,7 +257,7 @@ ptr dt_ldip(addr)
 		warning(WGIPEXP);
 		warn_dtbits(addr, psize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	p = p_in_data(addr);
 	LOG(("@g6 dt_ldip() returns %lu", p));
@@ -280,7 +280,7 @@ unsigned long dt_ldu(addr, n)
 		warning(n == 1 ? WGCEXP : WGIEXP);
 		warn_dtbits(addr, n);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += n-1;
 	for (i = (int) n-1; i >= 0; i--, addr--) {
@@ -305,7 +305,7 @@ unsigned long dt_lduw(addr)
 		warning(WGIEXP);
 		warn_dtbits(addr, wsize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += wsize-1;
 	for (i = (int) wsize-1; i >= 0; i--, addr--) {
@@ -331,7 +331,7 @@ long dt_lds(addr, n)
 		warning(n == 1 ? WGCEXP : WGIEXP);
 		warn_dtbits(addr, n);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += n-2;
 	l = btos(data_loc(addr + 1));
@@ -357,7 +357,7 @@ long dt_ldsw(addr)
 		warning(WGIEXP);
 		warn_dtbits(addr, wsize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += wsize-2;
 	l = btos(data_loc(addr + 1));
@@ -395,7 +395,7 @@ dt_mvd(d2, d1, n)			/* d1 -> d2 */
 		data_loc(d2) = data_loc(d1);
 #ifdef	LOGGING
 		dt_sh(d2) = dt_sh(d1) & ~SH_PROT;
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 }

@@ -416,7 +416,7 @@ dt_mvs(d, s, n)				/* s -> d */
 		data_loc(d) = stack_loc(s);
 #ifdef	LOGGING
 		dt_sh(d) = st_sh(s) & ~SH_PROT;
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 }

@@ -452,5 +452,5 @@ PRIVATE warn_dtbits(addr, n)
 		warningcont(WWASINSP);
 }

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/do_comp.c
+++ b/util/int/do_comp.c
@@ -18,7 +18,7 @@

 #ifndef	NOFLOAT
 extern double fpop();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 PRIVATE compare_obj();

@@ -45,9 +45,9 @@ DoCMF(l)
 	LOG(("@T6 DoCMF(%ld)", l));
 	spoilFRA();
 	wpush((long)(t < s ? 1 : t > s ? -1 : 0));
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoCMU(l)
@@ -160,7 +160,7 @@ PRIVATE compare_obj(obj_size)
 			comp_res = 1;
 			break;
 		}
-#endif	LOGGING
+#endif	/* LOGGING */
 		if (stack_loc(addr1) != stack_loc(addr2)) {
 			comp_res = 1;
 			break;
--- a/util/int/do_conv.c
+++ b/util/int/do_conv.c
@@ -16,7 +16,7 @@

 #ifndef	NOFLOAT
 extern double fpop();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 DoCII()
 {
@@ -163,9 +163,9 @@ DoCFI()
 	default:
 		wtrap(WILLCONV, EILLINS);
 	}
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoCIF()
@@ -198,9 +198,9 @@ DoCIF()
 	default:
 		wtrap(WILLCONV, EILLINS);
 	}
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoCUF()
@@ -244,9 +244,9 @@ DoCUF()
 	default:
 		wtrap(WILLCONV, EILLINS);
 	}
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoCFF()
@@ -271,9 +271,9 @@ DoCFF()
 	default:
 		wtrap(WILLCONV, EILLINS);
 	}
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoCIU()
@@ -377,7 +377,7 @@ DoCFU()
 	default:
 		wtrap(WILLCONV, EILLINS);
 	}
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }
--- a/util/int/do_fpar.c
+++ b/util/int/do_fpar.c
@@ -18,7 +18,16 @@

 extern double fpop();

-#define	MAXDOUBLE	99.e999		/* IEEE infinity */	/*???*/
+#ifdef __STDC__
+#include <float.h>
+#define MAXDOUBLE DBL_MAX
+#else /* not __STDC__ */
+#if defined(vax) || defined(pdp) || defined(__vax) || defined(__pdp)
+#define	MAXDOUBLE	1.701411834604692293e+38
+#else
+#define MAXDOUBLE	1.7976931348623157e+308
+#endif
+#endif /* not __STDC__ */
 #define	SMALL		(1.0/MAXDOUBLE)

 PRIVATE double adf(), sbf(), mlf(), dvf();
@@ -26,7 +35,7 @@ PRIVATE double ttttp();
 PRIVATE double floor(), fabs();
 PRIVATE fef(), fif();

-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 DoADF(l)
 	register size l;
@@ -38,9 +47,9 @@ DoADF(l)
 	LOG(("@F6 DoADF(%ld)", l));
 	spoilFRA();
 	fpush(adf(fpop(l), t), l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoSBF(l)
@@ -53,9 +62,9 @@ DoSBF(l)
 	LOG(("@F6 DoSBF(%ld)", l));
 	spoilFRA();
 	fpush(sbf(fpop(l), t), l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoMLF(l)
@@ -68,9 +77,9 @@ DoMLF(l)
 	LOG(("@F6 DoMLF(%ld)", l));
 	spoilFRA();
 	fpush(mlf(fpop(l), t), l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoDVF(l)
@@ -83,9 +92,9 @@ DoDVF(l)
 	LOG(("@F6 DoDVF(%ld)", l));
 	spoilFRA();
 	fpush(dvf(fpop(l), t), l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoNGF(l)
@@ -98,9 +107,9 @@ DoNGF(l)
 	LOG(("@F6 DoNGF(%ld)", l));
 	spoilFRA();
 	fpush(-t, l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoFIF(l)
@@ -113,9 +122,9 @@ DoFIF(l)
 	LOG(("@F6 DoFIF(%ld)", l));
 	spoilFRA();
 	fif(fpop(l), t, l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoFEF(l)
@@ -126,9 +135,9 @@ DoFEF(l)
 	LOG(("@F6 DoFEF(%ld)", l));
 	spoilFRA();
 	fef(fpop(arg_wf(l)), l);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 #ifndef	NOFLOAT
@@ -440,11 +449,11 @@ BadFloat:
 	return (0.0);
 }

-#else	NOFLOAT
+#else	/* NOFLOAT */

 nofloat() {
 	fatal("attempt to execute a floating point instruction on an EM machine without FP");
 }

-#endif	NOFLOAT
+#endif	/* NOFLOAT */

--- a/util/int/do_incdec.c
+++ b/util/int/do_incdec.c
@@ -111,10 +111,10 @@ DoZRF(l)
 	LOG(("@Z6 DoZRF(%ld)", l));
 	spoilFRA();
 	fpush(0.0, arg_wf(l));
-#else	NOFLOAT
+#else	/* NOFLOAT */
 	arg = arg;
 	nofloat();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 }

 DoZER(l)
--- a/util/int/do_intar.c
+++ b/util/int/do_intar.c
@@ -223,7 +223,7 @@ PRIVATE long sli(w1, w2, nbytes)	/* w1 << w2 */
 			warning(WSHLARGE);
 			w2 = nbytes*8 - 1;
 		}
-#endif	LOGGING
+#endif	/* LOGGING */
 	
 		if (!(IgnMask&BIT(EIOVFL))) {
 			/* check overflow */
@@ -256,7 +256,7 @@ PRIVATE long sri(w1, w2, nbytes)	/* w1 >> w2 */
 			w2 = nbytes*8 - 1;
 		}
 	}
-#endif	LOGGING
+#endif	/* LOGGING */
 	
 	/* calculate result */
 	return (w1 >> w2);
--- a/util/int/do_logic.c
+++ b/util/int/do_logic.c
@@ -17,13 +17,13 @@

 #ifdef	LOGGING
 extern int must_test;
-#endif	LOGGING
+#endif	/* LOGGING */

 #ifdef	LOGGING
 #define	check_def(p,l)	if (!st_sh(p) || !st_sh(p+l)) {warning(WUNLOG);}
 #else
 #define	check_def(p,l)
-#endif	LOGGING
+#endif	/* LOGGING */

 DoAND(l)
 	register size l;
@@ -113,7 +113,7 @@ DoROL(l)
 			t = l*8 - 1;
 		}
 	}
-#endif	LOGGING
+#endif	/* LOGGING */
 	
 	/* calculate result */
 	while (t--) {
@@ -146,7 +146,7 @@ DoROR(l)
 			t = l*8 - 1;
 		}
 	}
-#endif	LOGGING
+#endif	/* LOGGING */
 	
 	/* calculate result */
 	while (t--) {
--- a/util/int/do_proc.c
+++ b/util/int/do_proc.c
@@ -103,7 +103,7 @@ PRIVATE lfr(sz)
 	if (sz != FRASize) {
 		warning(FRASize < sz ? WRFUNSML : WRFUNLAR);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	pushFRA(sz);
 	spoilFRA();
--- a/util/int/do_ptrar.c
+++ b/util/int/do_ptrar.c
@@ -25,7 +25,7 @@

 #define	check_seg(s1,s2,w)

-#endif	SEGCHECK
+#endif	/* SEGCHECK */

 DoADP(l)
 	register long l;
--- a/util/int/do_unsar.c
+++ b/util/int/do_unsar.c
@@ -25,7 +25,7 @@

 #ifdef	LOGGING
 extern int must_test;
-#endif	LOGGING
+#endif	/* LOGGING */

 #define	adu(w1,w2)	(unsigned long)(w1 + w2)
 #define	sbu(w1,w2)	(unsigned long)(w1 - w2)
@@ -149,7 +149,7 @@ PRIVATE unsigned long slu(w1, w2, nbytes)	/* w1 << w2 */
 			w2 = nbytes*8 - 1;
 		}
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	/* calculate result */
 	return (w1 << w2);
@@ -168,7 +168,7 @@ PRIVATE unsigned long sru(w1, w2, nbytes)	/* w1 >> w2 */
 			w2 = nbytes*8 - 1;
 		}
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	/* calculate result */
 	return (w1 >> w2);
--- a/util/int/dump.c
+++ b/util/int/dump.c
@@ -639,5 +639,5 @@ displ_sh(shadow, byte)				/* transient */
 	return (buf);
 }

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/fra.c
+++ b/util/int/fra.c
@@ -9,13 +9,13 @@

 #ifdef	LOGGING
 char *FRA_sh;				/* shadowbytes */
-#endif	LOGGING
+#endif	/* LOGGING */

 init_FRA() {
 	FRA = Malloc(FRALimit, "Function Return Area");
 #ifdef	LOGGING
 	FRA_sh = Malloc(FRALimit, "shadowspace for Function Return Area");
-#endif	LOGGING
+#endif	/* LOGGING */
 	FRA_def = UNDEFINED;		/* set FRA illegal */
 }

@@ -32,7 +32,7 @@ pushFRA(sz)
 		stack_loc(SP + i) = FRA[i];
 #ifdef	LOGGING
 		st_sh(SP + i) = (i < FRASize ? FRA_sh[i] : UNDEFINED);
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 }

@@ -48,7 +48,7 @@ popFRA(sz)
 		FRA[i] = stack_loc(SP + i);
 #ifdef	LOGGING
 		FRA_sh[i] = st_sh(SP + i);
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 	st_dec(max(sz, wsize));
 }
--- a/util/int/global.h
+++ b/util/int/global.h
@@ -20,13 +20,13 @@ typedef unsigned long ptr;		/* pointer to EM address */
 #define	p2i(p)		(p)		/* convert pointer to index */
 #define	i2p(p)		(ptr)(p)	/* convert index to pointer */

-#else	UNSIGNED
+#else	/* UNSIGNED */

 typedef char *ptr;			/* pointer to EM address */
 #define	p2i(p)		(long)(p)	/* convert pointer to index */
 #define	i2p(p)		(ptr)(p)	/* convert index to pointer */

-#endif UNSIGNED
+#endif /* UNSIGNED */

 /* The EM size is an integer type; a cast suffices */
 typedef long size;
--- a/util/int/init.c
+++ b/util/int/init.c
@@ -198,5 +198,5 @@ st_clear_area(from, to)
 		st_undef(a);
 	}
 }
-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/io.c
+++ b/util/int/io.c
@@ -31,7 +31,7 @@ incr_mess_id()

 #ifdef	LOGGING
 extern long inr;			/* from log.c */
-#endif	LOGGING
+#endif	/* LOGGING */

 /********  General file handling  ********/

@@ -102,7 +102,7 @@ init_ofiles(firsttime)

 #ifdef	LOGGING
 	open_log(firsttime);
-#endif	LOGGING
+#endif	/* LOGGING */
 }

 /*VARARGS0*/
@@ -146,7 +146,7 @@ close_down(rc)

 #ifdef	LOGGING
 	close_log();
-#endif	LOGGING
+#endif	/* LOGGING */

 	exit(rc);
 }
@@ -188,9 +188,9 @@ char *position()			/* transient */
 	
 #ifdef	LOGGING
 	sprintf(buff, "\"%s\", line %ld, INR = %ld", fn, getLIN(), inr);
-#else	LOGGING
+#else	/* LOGGING */
 	sprintf(buff, "\"%s\", line %ld", fn, getLIN());
-#endif	LOGGING
+#endif	/* LOGGING */
 	return buff;
 }

--- a/util/int/log.c
+++ b/util/int/log.c
@@ -314,5 +314,5 @@ PRIVATE long longpar(var, def)
 	return (res ? atol(res) : def);
 }

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/log.h
+++ b/util/int/log.h
@@ -20,5 +20,5 @@ extern int logging;			/* set if logging in progress */

 #define	LOG(a)

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/m_ioctl.c
+++ b/util/int/m_ioctl.c
@@ -25,7 +25,7 @@
 #define	V7IOSETC	(('t'<<8)|17)
 #define	V7IOGETC	(('t'<<8)|18)

-#endif	V7IOCTL
+#endif	/* V7IOCTL */


 /************************************************************************
@@ -54,13 +54,13 @@ int do_ioctl(fd, req, addr)
 	long count;	/* might get ALIGNMENT problems with this one */
 	int ldisc;	/* might get ALIGNMENT problems with this one */
 	int pgrp;	/* might get ALIGNMENT problems with this one */
-#endif	V7IOCTL
+#endif	/* V7IOCTL */

 	struct tchars tc_buf;
 #ifndef	V7IOCTL
 	struct ltchars ltc_buf;
-#endif	V7IOCTL
-#endif	BSD_X
+#endif	/* V7IOCTL */
+#endif	/* BSD_X */


 #ifdef	V7IOCTL
@@ -92,14 +92,14 @@ int do_ioctl(fd, req, addr)
 	case V7IOGETC:
 		req = TIOCGETC;
 		break;
-#endif	BSD_X
+#endif	/* BSD_X */

 	default:
 		einval(WBADIOCTL);
 		return (-1);			/* Fake return value */
 	}

-#endif	V7IOCTL
+#endif	/* V7IOCTL */


 	switch (req) {
@@ -120,7 +120,7 @@ int do_ioctl(fd, req, addr)
 	case TIOCSETP:
 #ifdef	BSD4_1				/* from system.h */
 	case TIOCSETN:
-#endif	BSD4_1
+#endif	/* BSD4_1 */
 		/* set fd's parameters according to sgtty buffer	*/
 		/* pointed to (addr), so first fill sg_buf properly.	*/
 		if (	!mem2sgtty(addr, &sg_buf)
@@ -289,8 +289,8 @@ int do_ioctl(fd, req, addr)
 		}
 		break;

-#endif	V7IOCTL
-#endif	BSD_X
+#endif	/* V7IOCTL */
+#endif	/* BSD_X */

 	default:
 		einval(WBADIOCTL);
--- a/util/int/main.c
+++ b/util/int/main.c
@@ -35,7 +35,7 @@ size maxheap;				/* if set, max heap size */

 #ifdef	LOGGING
 extern long inr;			/* from log.c */
-#endif	LOGGING
+#endif	/* LOGGING */

 PRIVATE char *dflt_av[] = {"e.out", 0};	/* default arguments */

@@ -95,14 +95,14 @@ main(argc, argv)
 		else if (logarg(argv[i])) {
 			/* interesting for the logging machine */
 		}
-#endif	LOGGING
+#endif	/* LOGGING */
 		else break;
 	}

 #ifdef	LOGGING
 	/* Initialize the logging machine */
 	init_log();
-#endif	LOGGING
+#endif	/* LOGGING */

 	if (argc > i)
 		init(argc - i, argv + i);
@@ -127,7 +127,7 @@ main(argc, argv)
 #ifdef	NOFLOAT
 	if (FLAGS&FB_REALS)
 		warning(WFLUSED);
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 	if (FLAGS&FB_EXTRA)
 		warning(WEXTRIGN);
@@ -145,7 +145,7 @@ main(argc, argv)
 			/* log this instruction */
 			logging = 1;
 		}
-#endif	LOGGING
+#endif	/* LOGGING */

 		LOG(("@x9 PC = %lu OPCODE = %lu", PC,
 			btol(text_loc(PC)) < SECONDARY ?
@@ -174,7 +174,7 @@ main(argc, argv)

 #ifdef	LOGGING
 		log_eoi();
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 	
 	if (must_tally) {
--- a/util/int/moncalls.c
+++ b/util/int/moncalls.c
@@ -25,25 +25,25 @@ extern int fd_limit;			/* from io.c */

 #ifdef	BSD_X				/* from system.h */
 #include	<sys/timeb.h>
-#endif	BSD_X
+#endif	/* BSD_X */
 #ifdef	SYS_V
 struct timeb {			/* non-existing; we use an ad-hoc definition */
 	long time;
 	unsigned short millitm;
 	short timezone, dstflag;
 };
-#endif	SYS_V
+#endif	/* SYS_V */

 #ifdef	BSD4_2				/* from system.h */
 #include	<sys/time.h>
-#endif	BSD4_2
+#endif	/* BSD4_2 */

 #ifdef	SYS_V
 #include	<sys/errno.h>
 #undef		ERANGE			/* collision with trap.h */
 #include	<fcntl.h>
 #include	<time.h>
-#endif	SYS_V
+#endif	/* SYS_V */

 #include	<em_abs.h>
 #include	"logging.h"
@@ -62,7 +62,7 @@ extern long lseek();
 extern unsigned int alarm();
 extern long time();
 extern void sync();
-#endif	SYS_V
+#endif	/* SYS_V */

 #define	INT2SIZE	max(wsize, 2L)
 #define	INT4SIZE	max(wsize, 4L)
@@ -165,14 +165,14 @@ moncall()

 #ifdef	BSD4_2				/* from system.h */
 	struct timeval tv;		/* private timeval buffer */
-#endif	BSD4_2			
+#endif	/* BSD4_2			 */

 #ifdef	BSD_X				/* from system.h */
 	time_t utimbuf[2];		/* private utime buffer */
-#endif	BSD_X
+#endif	/* BSD_X */
 #ifdef	SYS_V				/* from system.h */
 	struct {time_t x, y;} utimbuf;	/* private utime buffer */
-#endif	SYS_V
+#endif	/* SYS_V */

 	char *cp;
 	int nr;
@@ -190,7 +190,7 @@ moncall()
 			UNDEFINED : DEFINED;
 #else
 		ES_def = DEFINED;
-#endif	LOGGING
+#endif	/* LOGGING */
 		ES = pop_int();
 		running = 0;		/* stop the machine */
 		LOG(("@m9 Exit: ES = %ld", ES));
@@ -247,7 +247,7 @@ moncall()
 				LOG(("@m6 Read: char = '%c'", *(buf[0] + i)));
 			}
 		}
-#endif	LOGGING
+#endif	/* LOGGING */

 		if (in_gda(dsp1) && !in_gda(dsp1 + (n-1))) {
 			efault(WRGDAH);
@@ -313,7 +313,7 @@ moncall()
 				warning(in_stack(addr) ? WWLUNDEF : WWGUNDEF);
 			}
 		}
-#endif	LOGGING
+#endif	/* LOGGING */

 		check_buf(0, (size)nbytes);
 		for (	nr = nbytes, addr = dsp1, cp = buf[0];
@@ -331,7 +331,7 @@ moncall()
 				LOG(("@m6 write: char = '%c'", *(buf[0] + i)));
 			}
 		}
-#endif	LOGGING
+#endif	/* LOGGING */

 		if ((n = write(fd, buf[0], nbytes)) == -1)
 			goto write_error;
@@ -575,9 +575,9 @@ moncall()
 		if (	!savestr(0, dsp1)
 #ifndef	BSD4_2				/* from system.h */
 		||	umount(buf[0]) == -1
-#else	BSD4_2
+#else	/* BSD4_2 */
 		||	unmount(buf[0]) == -1
-#endif	BSD4_2
+#endif	/* BSD4_2 */
 		) {
 			push_err();
 			LOG(("@m4 Umount: failed, dsp1 = %lu, errno = %d",
@@ -618,11 +618,11 @@ moncall()
 		tm = pop_int4();
 #ifndef	BSD4_2				/* from system.h */
 		rc = stime(&tm);
-#else	BSD4_2
+#else	/* BSD4_2 */
 		tv.tv_sec = tm;
 		tv.tv_usec = 0;		/* zero microseconds */
 		rc = settimeofday(&tv, (struct timezone *)0);
-#endif	BSD4_2
+#endif	/* BSD4_2 */
 		if (rc == -1) {
 			push_err();
 			LOG(("@m4 Stime: failed, tm = %ld, errno = %d",
@@ -695,11 +695,11 @@ moncall()
 #ifdef	BSD_X				/* from system.h */
 		utimbuf[0] = actime;
 		utimbuf[1] = modtime;
-#endif	BSD_X
+#endif	/* BSD_X */
 #ifdef	SYS_V				/* from system.h */
 		utimbuf.x = actime;
 		utimbuf.y = modtime;
-#endif	SYS_V
+#endif	/* SYS_V */
 		if (!savestr(0, dsp1) || utime(buf[0], utimbuf) == -1) {
 			push_err();
 			LOG(("@m4 Utime: failed, dsp1 = %lu, dsp2 = %lu, errno = %d",
@@ -740,13 +740,13 @@ moncall()
 		dsp2 = pop_ptr();
 #ifdef	BSD_X				/* from system.h */
 		ftime(&tb_buf);
-#endif	BSD_X
+#endif	/* BSD_X */
 #ifdef	SYS_V				/* from system.h */
 		tb_buf.time = time((time_t*)0);
 		tb_buf.millitm = 0;
 		tb_buf.timezone = timezone / 60;
 		tb_buf.dstflag = daylight;
-#endif	SYS_V
+#endif	/* SYS_V */
 		if (!timeb2mem(dsp2, &tb_buf)) {
 			push_err();
 			LOG(("@m4 Ftime: failed, dsp2 = %lu, errno = %d",
@@ -794,7 +794,7 @@ moncall()
 			}
 #ifdef	BSD_X				/* from system.h */
 			fdnew = dup2(fd1, fdnew);
-#endif	BSD_X
+#endif	/* BSD_X */

 #ifdef	SYS_V				/* from system.h */
 			{
@@ -814,7 +814,7 @@ moncall()
 					fdnew = fcntl(fd1, F_DUPFD, fdnew);
 				}
 			}
-#endif	SYS_V
+#endif	/* SYS_V */
 		dup2_error:;
 		}
 		else {
--- a/util/int/monstruct.c
+++ b/util/int/monstruct.c
@@ -20,14 +20,14 @@

 #ifdef	BSD_X				/* from system.h */
 #include	<sys/timeb.h>
-#endif	BSD_X
+#endif	/* BSD_X */
 #ifdef	SYS_V				/* from system.h */
 struct timeb {	/* non-existing; we use an ad-hoc definition */
 	long time;
 	unsigned short millitm;
 	short timezone, dstflag;
 }
-#endif	SYS_V
+#endif	/* SYS_V */

 /******** System to EM memory ********/

@@ -130,8 +130,8 @@ int ltchars2mem(addr, ltcharsb)
 	mem_stfld(addr, V7t_lnextc, (long) ltcharsb->t_lnextc);
 	return 1;
 }
-#endif	V7IOCTL
-#endif	BSD_X
+#endif	/* V7IOCTL */
+#endif	/* BSD_X */


 /******** EM memory to system ********/
@@ -188,6 +188,6 @@ int mem2ltchars(addr, ltcharsb)
 	ltcharsb->t_lnextc = (char) mem_ldfld(addr, V7t_lnextc);
 	return 1;
 }
-#endif	V7IOCTL
-#endif	BSD_X
+#endif	/* V7IOCTL */
+#endif	/* BSD_X */

--- a/util/int/proctab.c
+++ b/util/int/proctab.c
@@ -69,6 +69,6 @@ end_init_proctab()
 		LOG((" r5: proctab[%ld]: nloc = %d, ep = %lu, ff = %lu",
 				p, pr->pr_nloc, pr->pr_ep, pr->pr_ff));
 	}
-#endif	LOGGING
+#endif	/* LOGGING */
 }

--- a/util/int/proto.make
+++ b/util/int/proto.make
@@ -119,7 +119,7 @@ trap_msg:	$(SRC_DIR)/M.trap_msg $(TRAPS)
 warn_msg:	$(SRC_DIR)/M.warn_msg $(APP_A)
 	$(SRC_DIR)/M.warn_msg $(APP_A)

-warn.h:		$(SRC_DIR)/M.warn_h $(APP_A)
+./warn.h:		$(SRC_DIR)/M.warn_h $(APP_A)
 	$(SRC_DIR)/M.warn_h $(APP_A)

 switch/DoCases:
@@ -142,7 +142,7 @@ test/awa.em44:


 # Auxiliary entries
-lint:	$(CFILES) trap_msg warn_msg warn.h switch/DoCases switch/PrCases
+lint:	$(CFILES) trap_msg warn_msg ./warn.h switch/DoCases switch/PrCases
 	$(LINT) $(LINTFLAGS) $(CFILES)

 tags:	$(HDR) $(CFILES)
@@ -170,7 +170,7 @@ clean:
 bare:	clean
 	(cd switch; make bare)

-depend:	warn.h trap_msg warn_msg
+depend:	./warn.h trap_msg warn_msg
 	sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new
 	echo '#DEPENDENCIES' >>Makefile.new
 	for i in $(CFILES) ; do \
--- a/util/int/read.c
+++ b/util/int/read.c
@@ -21,7 +21,7 @@

 #ifndef	NOFLOAT
 extern double str2double();
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 /************************************************************************
 *	Read object file contents.					*
@@ -214,7 +214,7 @@ PRIVATE ptr rd_repeat(pos, count, prev_pos)
 #ifdef	LOGGING
 			/* copy shadow byte, including protection bit */
 			dt_sh(pos) = dt_sh(pos - diff);
-#endif	LOGGING
+#endif	/* LOGGING */
 			pos++;
 		}
 	}
@@ -284,10 +284,10 @@ PRIVATE ptr rd_descr(type, count, pos)
 #ifndef	NOFLOAT
 		/* store the float */
 		dt_stf(pos, str2double(fl_rep), j);
-#else	NOFLOAT
+#else	/* NOFLOAT */
 		/* we cannot store the float */
 		warning(WFLINIT);
-#endif	NOFLOAT
+#endif	/* NOFLOAT */
 		pos += j;
 		break;
 	default:
--- a/util/int/rsb.c
+++ b/util/int/rsb.c
@@ -77,7 +77,7 @@ int poprsb(rtt)
 		if (SP > properSP)
 			warning(rtt ? WRTTSTS : WRETSTS);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	/* discard stack up to RSB */
 	newSP(LB);
--- a/util/int/segment.c
+++ b/util/int/segment.c
@@ -72,7 +72,7 @@ int ptr2seg(p)
 	return s;
 }

-#else	SEGCHECK
+#else	/* SEGCHECK */

 init_AB_list() {}

@@ -80,5 +80,5 @@ push_frame() {}

 pop_frames() {}

-#endif	SEGCHECK
+#endif	/* SEGCHECK */

--- a/util/int/shadow.h
+++ b/util/int/shadow.h
@@ -98,5 +98,5 @@ extern char *stackML_sh;	/* stack_sh + ML (to speed up stack access) */
 #define	ch_dt_prot(a)
 #define	ch_st_prot(a)

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/stack.c
+++ b/util/int/stack.c
@@ -26,7 +26,7 @@ extern size maxstack;			/* from main.c */
 #ifdef	LOGGING
 char *stack_sh;				/* stadowbytes */
 char *stackML_sh;			/* speed up access of stadowbytes */
-#endif	LOGGING
+#endif	/* LOGGING */

 PRIVATE warn_stbits();

@@ -44,7 +44,7 @@ init_stack() {
 	stack_sh = Malloc(STACKSIZE, "shadowspace for stack");
 	stackML_sh = stack_sh + ML;
 	st_clear_area(ML, SL);
-#endif	LOGGING
+#endif	/* LOGGING */
 }


@@ -94,12 +94,12 @@ newSP(ap)
 			stack_sh = Realloc(stack_sh, (size)(stacksize),
 						"shadowspace for stack");
 			stackML_sh = stack_sh + ML;
-#endif	LOGGING
+#endif	/* LOGGING */
 		}

 #ifdef	LOGGING
 		st_clear_area(SP - 1, p);
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 	SP = p;
 }
@@ -229,7 +229,7 @@ st_stn(addr, al, n)
 		stack_loc(addr) = (char) l;
 #ifdef	LOGGING
 		st_sh(addr) = sh_flags;
-#endif	LOGGING
+#endif	/* LOGGING */
 		l = l>>8;
 	}
 }
@@ -255,7 +255,7 @@ st_stw(addr, al)
 		stack_loc(addr) = (char) l;
 #ifdef	LOGGING
 		st_sh(addr) = sh_flags;
-#endif	LOGGING
+#endif	/* LOGGING */
 		l = l>>8;
 	}
 }
@@ -283,7 +283,7 @@ st_stf(addr, f, n)
 		st_fl(addr);
 	}
 }
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 /************************************************************************
 *	Stack load division.						*
@@ -313,7 +313,7 @@ ptr st_lddp(addr)
 		warning(WLDPEXP);
 		warn_stbits(addr, psize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	p = p_in_stack(addr);
 	LOG(("@s6 st_lddp() returns %lu", p));
@@ -334,7 +334,7 @@ ptr st_ldip(addr)
 		warning(WLIPEXP);
 		warn_stbits(addr, psize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	p = p_in_stack(addr);
 	LOG(("@s6 st_ldip() returns %lu", p));
@@ -357,7 +357,7 @@ unsigned long st_ldu(addr, n)
 		warning(n == 1 ? WLCEXP : WLIEXP);
 		warn_stbits(addr, n);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += n-1;
 	for (i = (int) n-1; i >= 0; i--, addr--) {
@@ -382,7 +382,7 @@ unsigned long st_lduw(addr)
 		warning(WLIEXP);
 		warn_stbits(addr, wsize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += wsize - 1;
 	for (i = (int) wsize-1; i >= 0; i--, addr--) {
@@ -408,7 +408,7 @@ long st_lds(addr, n)
 		warning(n == 1 ? WLCEXP : WLIEXP);
 		warn_stbits(addr, n);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += n - 2;
 	l = btos(stack_loc(addr + 1));
@@ -434,7 +434,7 @@ long st_ldsw(addr)
 		warning(WLIEXP);
 		warn_stbits(addr, wsize);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	addr += wsize - 2;
 	l = btos(stack_loc(addr+1));
@@ -470,7 +470,7 @@ double st_ldf(addr, n)
 		warning(WLFEXP);
 		warn_stbits(addr, n);
 	}
-#endif	LOGGING
+#endif	/* LOGGING */

 	for (i = (int) n; i > 0; i--, addr++) {
 		*(cp++) = stack_loc(addr);
@@ -480,7 +480,7 @@ double st_ldf(addr, n)
 	}
 	return (f);
 }
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 /************************************************************************
 *	Stack move division						*
@@ -516,7 +516,7 @@ st_mvs(s2, s1, n)			/* s1 -> s2 */
 		stack_loc(s2) = stack_loc(s1);
 #ifdef	LOGGING
 		st_sh(s2) = st_sh(s1) & ~SH_PROT;
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 }

@@ -536,7 +536,7 @@ st_mvd(s, d, n)				/* d -> s */
 		stack_loc(s) = data_loc(d);
 #ifdef	LOGGING
 		st_sh(s) = dt_sh(d) & ~SH_PROT;
-#endif	LOGGING
+#endif	/* LOGGING */
 	}
 }

@@ -658,7 +658,7 @@ double fpop(n)
 	decSP(n);
 	return (d);
 }
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 long wpop()
 {
@@ -762,7 +762,7 @@ fpush(f, n)
 	incSP(n);
 	st_stf(SP, f, n);
 }
-#endif	NOFLOAT
+#endif	/* NOFLOAT */

 #ifdef	LOGGING

@@ -796,5 +796,5 @@ PRIVATE warn_stbits(addr, n)
 		warningcont(WWASINSP);
 }

-#endif	LOGGING
+#endif	/* LOGGING */

--- a/util/int/sysidf.h
+++ b/util/int/sysidf.h
@@ -9,13 +9,13 @@

 #ifdef	BSD4_1
 #define	BSD_X
-#endif	BSD4_1
+#endif	/* BSD4_1 */

 #ifdef	BSD4_2
 #define	BSD_X
-#endif	BSD4_2
+#endif	/* BSD4_2 */

 #ifdef	SYS_5
 #define	SYS_V
-#endif	SYS_5
+#endif	/* SYS_5 */

--- a/util/int/warn.c
+++ b/util/int/warn.c
@@ -146,7 +146,7 @@ warningcont(nr)
 	}
 }

-#endif	LOGGING
+#endif	/* LOGGING */

 set_wmask(i)
 	int i;