summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2007-01-19 08:17:34 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2007-01-19 08:17:34 (GMT)
commitea90619addc53b48a04c8596d172f074dc7527cb (patch)
tree40489e4769c75174227797963901549e65d43978
parent34a3970c39dead78485d1bd7b7f4b858922c8f69 (diff)
downloadtcl-ea90619addc53b48a04c8596d172f074dc7527cb.zip
tcl-ea90619addc53b48a04c8596d172f074dc7527cb.tar.gz
tcl-ea90619addc53b48a04c8596d172f074dc7527cb.tar.bz2
Windows build fixes
-rw-r--r--ChangeLog8
-rw-r--r--tools/man2tcl.c5
-rw-r--r--win/nmakehlp.c4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 695ac2e..e546dbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2006-01-19 Daniel Steffen <das@users.sourceforge.net>
+2007-01-19 Joe Mistachkin <joe@mistachkin.com>
+
+ * tools/man2tcl.c: Include stdlib.h for exit() and improve comment
+ detection.
+ * win/nmakehlp.c: Update usage.
+
+2007-01-19 Daniel Steffen <das@users.sourceforge.net>
* macosx/tclMacOSXFCmd.c (TclMacOSXSetFileAttribute): on some versions
of Mac OS X, truncate() fails on resource forks, in that case use
diff --git a/tools/man2tcl.c b/tools/man2tcl.c
index aa8dfbc..a90b729 100644
--- a/tools/man2tcl.c
+++ b/tools/man2tcl.c
@@ -15,12 +15,13 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: man2tcl.c,v 1.10 2005/11/04 00:06:49 dkf Exp $
+ * RCS: @(#) $Id: man2tcl.c,v 1.11 2007/01/19 08:17:35 mistachkin Exp $
*/
static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
@@ -135,7 +136,7 @@ main(
}
lineNumber++;
- if ((line[0] == '\'') && (line[1] == '\\') && (line[2] == '\"')) {
+ if (((line[0] == '.') || (line[0] == '\'')) && (line[1] == '\\') && (line[2] == '\"')) {
/*
* This line is a comment. Ignore it.
*/
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index b60a7e9..5034346 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -10,7 +10,7 @@
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* ----------------------------------------------------------------------------
- * RCS: @(#) $Id: nmakehlp.c,v 1.13 2007/01/11 13:17:09 patthoyts Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.14 2007/01/19 08:17:35 mistachkin Exp $
* ----------------------------------------------------------------------------
*/
@@ -148,7 +148,7 @@ main(
}
}
chars = snprintf(msg, sizeof(msg) - 1,
- "usage: %s -c|-l|-f ...\n"
+ "usage: %s -c|-l|-f|-g|-V ...\n"
"This is a little helper app to equalize shell differences between WinNT and\n"
"Win9x and get nmake.exe to accomplish its job.\n",
argv[0]);