Annotate incondefs in source code.

CVS patchset: 5511
CVS date: 2002/06/19 19:27:20

diff --git a/.lclintrc b/.lclintrc
index 05782d4..ab56d95 100644 (file)
--- a/.lclintrc
+++ b/.lclintrc
@@ -11,7 +11,6 @@
 -unrecogcomments       # XXX ignore doxygen markings
 
 +strict                        # lclint level
--includenest 16                # getting deep, sigh
 
 # --- in progress
 #+bounds
@@ -28,15 +27,12 @@
 -fielduse              # 1 occurence <bits/sigset.h>
 -forblock              # tedious
 -ifblock               # tedious
--incondefs             # <bits/{ipc,pthreadtypes}.h> heartburn
--matchfields           # <bits/ipc.h> heartburn
 -namechecks            # tedious ANSI compliance checks
--numstructfields 256   # Java jni.h has 229 fields
 -ptrarith              # tedious
 
 -compdestroy
 -mustdefine
--shiftimplementation   # <ctype.h> pain
+-sys-dir-errors
 
 -strictops
 -whileblock            # tedious
@@ -50,7 +46,6 @@
 #+strictbranchstate
 #+strictdestroy
 #+ansi-reserved-internal
-#+sys-dir-errors       # 749
 #controlnestdepth 15
 
 # --- not-yet at checks level

diff --git a/system.h b/system.h
index edc05a3..087e1eb 100644 (file)
--- a/system.h
+++ b/system.h
@@ -193,7 +193,6 @@ char *alloca ();
 # endif
 #endif
 
-#include <ctype.h>
 #if defined (__GLIBC__) && defined(__LCLINT__)
 /*@-declundef@*/
 /*@unchecked@*/
@@ -201,7 +200,11 @@ extern __const __int32_t *__ctype_tolower;
 /*@unchecked@*/
 extern __const __int32_t *__ctype_toupper;
 /*@=declundef@*/
+#endif
 
+#include <ctype.h>
+
+#if defined (__GLIBC__) && defined(__LCLINT__)
 /*@-exportlocal@*/
 extern int isalnum(int) __THROW        /*@*/;
 extern int iscntrl(int) __THROW        /*@*/;