X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/1b8ae6904556859bbe91aadf35b8adcc1a0611ce..061ece7d6fedbde47030222fea74b575c12707dc:/src/scanline.c

diff --git a/src/scanline.c b/src/scanline.c
index 106a906..5b0baa8 100644
--- a/src/scanline.c
+++ b/src/scanline.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -17,8 +17,8 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on splint: splint@cs.virginia.edu
-** To report a bug: splint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
@@ -40,7 +40,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "signature.h"
 # include "signature2.h"
 # include "scan.h"
@@ -51,8 +51,9 @@
 /*@notfunction@*/
 # define MOVECHAR()   do { *bufptr++ = c; c = *currentLine++; colNumber++; } while (FALSE) 
 
-/*@constant static int MAXCHAR;@*/
-# define MAXCHAR 512      
+/* evans 2003-04-21: changed name to avoid conflict with MS VC++ */
+/*@constant static int SCANMAXCHAR;@*/ 
+# define SCANMAXCHAR 512      
 
 /*@constant static int TABSIZE;@*/
 # define TABSIZE 8	
@@ -66,7 +67,7 @@ static int startCol;
 static bool reportEOL;		
 static bool reportComments;	
 
-static char tokenBuffer[MAXCHAR];
+static char tokenBuffer[SCANMAXCHAR];
 
 static const charClassData charClassDef[] =
 {