[xorg-commit-diffs] xc/extras/rman rman.c,1.1.4.2.2.1,1.1.4.2.2.2

Fri Apr 2 13:47:45 PST 2004

Committed by: eich

Update of /cvs/xorg/xc/extras/rman
In directory pdx:/tmp/cvs-serv13014/extras/rman

Modified Files:
      Tag: XORG-RELEASE-1
	rman.c 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



Index: rman.c
===================================================================
RCS file: /cvs/xorg/xc/extras/rman/rman.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.2

--- a/rman.c	4 Mar 2004 17:46:15 -0000	1.1.4.2.2.1
+++ b/rman.c	2 Apr 2004 21:47:11 -0000	1.1.4.2.2.2
@@ -180,7 +180,7 @@
 	"AWK", "cvs", "rcs", "GL", "vi", "PGP", "QuickTime", "DDD", "XPG/3",
 	"NFS", "NIS", "NIS+", "AFS",
 	"UNIX", "SysV",
-	"XFree86", "ICCCM",
+	"Xorg", "XOrg", "X.Org", "XFree86", "ICCCM",
 	"MH", "MIME",
 	"TeX", "LaTeX", "PicTeX",
 	"PostScript", "EPS", "EPSF", "EPSI",
@@ -462,7 +462,7 @@
 	manrefname = p;
 	while (*p && *p!=' ' && *p!='(') p++; *p++='\0';
 	while (*p==' ' || *p=='(') p++; p0=p;
-#ifdef XFree86
+#if defined(XOrg) || defined(XFree86)
 	/* Don't allow a letter after the man section number */
 	p++;
 #else
@@ -1293,7 +1293,7 @@
 	switch (cmd) {
 	   case CHARNBSP:	printf("&nbsp;"); I++; break;
 	   case CHARTAB:	printf("<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;");	break;
-#ifdef XFree86
+#if defined(XOrg) || defined(XFree86)
 	   /* using named entities for ASCII quote characters is redundant */
 	   case CHARLQUOTE:
 	   case CHARRQUOTE:
@@ -1373,7 +1373,7 @@
 /*		printf("<isindex>\n");*/
 		/* better title possible? */
 		printf("<title>"); printf(manTitle, manName, manSect); printf("</title>\n");
-#ifdef XFree86
+#if defined(XOrg) || defined(XFree86)
 		printf("</head>\n<body bgcolor='#efefef' text='black' "
 			"link='blue' vlink='#551A8B' alink='red'>\n");
 #else


