noexpand always false.

[splint.git] / src / scanline.c

diff --git a/src/scanline.c b/src/scanline.c
index a9f8be6e2b766aed3563490c916acf5b97a3872f..5b0baa824375004f4bbc2a30c622b981fc6924bd 100644 (file)
--- 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
@@ -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[] =
 {