Proper source of macro error misunderstanding ' as the leading macro

command found and repaired.

3 files changed, 5 insertions, 26 deletions

diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 9924d23..cc353bd 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: genStubs.tcl,v 1.9 2001/08/16 09:46:48 davygrvy Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.10 2002/05/08 12:20:15 davygrvy Exp $
 
 package require Tcl 8
 
@@ -348,7 +348,7 @@ proc genStubs::makeDecl {name decl index} {
     lassign $decl rtype fname args
 
     append text "/* $index */\n"
-    set line "EXTERN $rtype"
+    set line "TCL_EXTERN($rtype)"
     set count [expr {2 - ([string length $line] / 8)}]
     append line [string range "\t\t\t" 0 $count]
     set pad [expr {24 - [string length $line]}]
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index acf0d88..875f9a6 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: man2help2.tcl,v 1.9 2002/05/08 04:23:42 davygrvy Exp $
+# RCS: @(#) $Id: man2help2.tcl,v 1.10 2002/05/08 12:20:15 davygrvy Exp $
 # 
 
 # Global variables used by these scripts:
@@ -684,22 +684,6 @@ proc char {name} {
 }
 
 
-# macro2 --
-#
-# This procedure handles macros that are invoked with a leading "'"
-# character instead of space.  Right now it just generates an
-# error diagnostic.
-#
-# Arguments:
-# name -		The name of the macro (without the ".").
-# args -		Any additional arguments to the macro.
-
-proc macro2 {name args} {
-    puts stderr "Unknown macro: '$name [join $args " "]"
-}
-
-
-
 # SHmacro --
 #
 # Subsection head; handles the .SH macro.
diff --git a/tools/man2tcl.c b/tools/man2tcl.c
index cbafb8e..4a56ff8 100644
--- a/tools/man2tcl.c
+++ b/tools/man2tcl.c
@@ -16,7 +16,7 @@
  * 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.5 2002/05/08 04:22:29 davygrvy Exp $
+ * RCS: @(#) $Id: man2tcl.c,v 1.6 2002/05/08 12:20:15 davygrvy Exp $
  */
 
 static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
@@ -142,7 +142,7 @@ main(argc, argv)
 		exit(1);
 	    }
 
-	    if ((line[0] == '.') || (line[0] == '\'')) {
+	    if (line[0] == '.') {
 		/*
 		 * This line is a macro invocation.
 		 */
@@ -201,11 +201,6 @@ DoMacro(line)
     if (writeOutput) {
 	printf("macro");
     }
-    if (*line != '.') {
-	if (writeOutput) {
-	    printf("2");
-	}
-    }
 
     /*
      * Parse the arguments to the macro (including the name), in order.