Add -d flag for compilers like the Sun C compilers that produce dependency

    lists themselves. To use with the Sun compilers, add to host.def: #
    define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
    bug id #4245688 - fix by Alan Coopersmith)
Add Solaris to the platforms on which mprotect is run to set execute
    permissions when necessary. (Sun bug id #6175128 - fix by Alan
    Coopersmith)
Internationalize digital output (Sun bug id #4119396 - fix by Steve
    Swales), add -bgpixmap option to set XPM file as background (originally
    from STSF project version of xclock by Alan Coopersmith)
xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
    are one too low in error messages (Xorg bugzilla #1739, Sun bug id
    4637857 - fix by Sam Lau)

diff --git a/handle.c b/handle.c
index 09f40cb..4cd7554 100644 (file)
--- a/handle.c
+++ b/handle.c
@@ -100,7 +100,7 @@ copy_to_scratch(char *s, int len)
 static void
 badheader(void)
 {
-    fprintf (stderr, "%s:  %s:%d:  bad ", ProgramName, inputFilename, lineno);
+    fprintf (stderr, "%s:  %s:%d:  bad ", ProgramName, inputFilename, lineno+1);
     parse_errors++;
 }
 
@@ -179,7 +179,7 @@ handle_line(char *line,             /* string to parse */
     }
 
     fprintf (stderr, "%s:  unknown command on line %s:%d\n",
-            ProgramName, inputFilename, lineno);
+            ProgramName, inputFilename, lineno+1);
     parse_errors++;
 }
 

diff --git a/pf.c b/pf.c
index cfa2a90..621fc55 100644 (file)
--- a/pf.c
+++ b/pf.c
@@ -114,7 +114,7 @@ void process_line (buffer)
     if (i >= 0) cp[len = (i+1)] = '\0';  /* nul terminate */
 
     if (verbose) {
-       printf ("! %d:  %s\n", lineno, cp);
+       printf ("! %d:  %s\n", lineno+1, cp);
     }
 
     /* handle input */