X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/6c50dc9249a1abaee3d737a499833718be2e6e0a..b73d1009d4a3494951c129e49f50f8b4c795deb1:/src/usymtab_interface.c

diff --git a/src/usymtab_interface.c b/src/usymtab_interface.c
index 9509586..f55a388 100644
--- a/src/usymtab_interface.c
+++ b/src/usymtab_interface.c
@@ -32,7 +32,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "lclsyntable.h"
@@ -863,7 +863,7 @@ declareAbstractType (abstractNode n, bool priv)
   cstring tn;
   fileloc loc;
   uentry ue;
-  usymId uid;
+  typeId uid;
   abstBodyNode ab;
 
   if (n == (abstractNode) 0)
@@ -949,10 +949,8 @@ declareAbstractType (abstractNode n, bool priv)
     }
 }
 
-static void
-  declareExposedType (exposedNode n, bool priv)
+static void declareExposedType (exposedNode n, bool priv)
 {
-  usymId uid;
   qtype c;
   cstring s;
 
@@ -982,7 +980,7 @@ static void
 	uentry_setDefined (ue, loc);
       }
 
-    uid = usymtab_supExposedTypeEntry (ue, context_inLCLLib () && !priv);
+    (void) usymtab_supExposedTypeEntry (ue, context_inLCLLib () && !priv);
   } end_declaratorInvNodeList_elements;
 
   qtype_free (c);
@@ -1120,7 +1118,7 @@ declareFcnAux (fcnNode f, /*@only@*/ qtype qt, ctype ct,
 	}
     }
 
-  if (usymId_isInvalid (tn))
+  if (typeId_isInvalid (tn))
     {
       acct = context_fileAccessTypes ();
     }