Making fixes for Microsoft Visual C++ compiler.

[splint.git] / src / Headers / qtype.h

diff --git a/src/Headers/qtype.h b/src/Headers/qtype.h
index eefceea15f89dc98e9a55728fc1d5d92efd1c0e9..a2c2e657a7bfddd6f27137b2d2a3b29e25e7f3ff 100644 (file)
--- a/src/Headers/qtype.h
+++ b/src/Headers/qtype.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2000.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -12,7 +12,7 @@
 # ifndef QTYPEH
 # define QTYPEH
 
-abst_typedef /*@null@*/ struct _qtype
+abst_typedef /*@null@*/ struct
 {
   ctype    type;
   qualList quals;
@@ -21,10 +21,10 @@ abst_typedef /*@null@*/ struct _qtype
 /*@constant null qtype qtype_undefined;@*/
 # define qtype_undefined ((qtype) NULL)
 
-extern /*@truenull@*/ bool qtype_isUndefined (qtype p_q);
+extern /*@nullwhentrue@*/ bool qtype_isUndefined (qtype p_q);
 # define qtype_isUndefined(q) ((q) == qtype_undefined)
 
-extern /*@falsenull@*/ bool qtype_isDefined (qtype p_q);
+extern /*@falsewhennull@*/ bool qtype_isDefined (qtype p_q);
 # define qtype_isDefined(q)   ((q) != qtype_undefined)
 
 extern ctype qtype_getType (/*@sef@*/ qtype p_q);
@@ -38,11 +38,9 @@ extern /*@exposed@*/ qualList qtype_getQuals (/*@sef@*/ qtype p_q);
 extern void qtype_setType (/*@sef@*/ qtype p_q, ctype p_c);
 # define qtype_setType(q, c) (qtype_isDefined(q) ? (q)->type = (c) : (c))
 
-# ifndef NOLCL
 extern qtype qtype_addQualList (/*@returned@*/ qtype p_qt, qualList p_ql);
 extern qtype qtype_mergeImplicitAlt (/*@returned@*/ qtype p_q1, /*@only@*/ qtype p_q2);
 extern /*@only@*/ qtype qtype_copy (qtype p_q);
-# endif
 
 extern /*@notnull@*/ qtype qtype_create (ctype p_c) /*@*/ ;
 extern /*@only@*/ qtype qtype_unknown(void) /*@*/ ;
@@ -51,7 +49,7 @@ extern qtype qtype_combine (/*@returned@*/ qtype p_q1, ctype p_ct);
 extern qtype qtype_mergeAlt (/*@returned@*/ qtype p_q1, /*@only@*/ qtype p_q2);
 
 extern qtype qtype_resolve (/*@returned@*/ qtype p_q);
-extern void qtype_adjustPointers (int p_n, /*@returned@*/ qtype p_q);
+extern void qtype_adjustPointers (/*@only@*/ pointers p_n, /*@returned@*/ qtype p_q);
 extern /*@only@*/ cstring qtype_unparse (qtype p_q) /*@*/ ;
 extern qtype qtype_newBase (/*@returned@*/ qtype p_q, ctype p_ct);
 extern qtype qtype_newQbase (/*@returned@*/ qtype p_q1, qtype p_q2);