Tcl Source Code

Artifact [966e55f2ea]
Login

Artifact 966e55f2ea44064a4adb930872fc233eef5648cc:

Attachment "scan.patch" to ticket [441230ffff] added by dgp 2001-07-14 08:15:07.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tcl/tcl/ChangeLog,v
retrieving revision 1.494
diff -u -r1.494 ChangeLog
--- ChangeLog	2001/07/12 13:36:09	1.494
+++ ChangeLog	2001/07/14 01:07:10
@@ -1,3 +1,8 @@
+2001-07-13  Don Porter  <[email protected]>
+
+	* generics/tkCmdMZ.c: Removed extra copy of the SCAN_* macros
+	#defined in generic/tclScan.c. [Bug 441230]
+
 2001-07-12  Donal K. Fellows  <[email protected]>
 
 	* tests/unixInit.test (unixInit-2.8): Added extra constraint,
Index: generic/tclCmdMZ.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCmdMZ.c,v
retrieving revision 1.40
diff -u -r1.40 tclCmdMZ.c
--- generic/tclCmdMZ.c	2001/07/12 13:15:09	1.40
+++ generic/tclCmdMZ.c	2001/07/14 01:07:39
@@ -22,22 +22,6 @@
 #include "tclRegexp.h"
 
 /*
- * Flag values used by Tcl_ScanObjCmd.
- */
-
-#define SCAN_NOSKIP	0x1		  /* Don't skip blanks. */
-#define SCAN_SUPPRESS	0x2		  /* Suppress assignment. */
-#define SCAN_UNSIGNED	0x4		  /* Read an unsigned value. */
-#define SCAN_WIDTH	0x8		  /* A width value was supplied. */
-
-#define SCAN_SIGNOK	0x10		  /* A +/- character is allowed. */
-#define SCAN_NODIGITS	0x20		  /* No digits have been scanned. */
-#define SCAN_NOZERO	0x40		  /* No zero digits have been scanned. */
-#define SCAN_XOK	0x80		  /* An 'x' is allowed. */
-#define SCAN_PTOK	0x100		  /* Decimal point is allowed. */
-#define SCAN_EXPOK	0x200		  /* An exponent is allowed. */
-
-/*
  * Structure used to hold information about variable traces:
  */