Factor -type problems into explicit code annotations.

1 files changed, 6 insertions, 4 deletions

diff --git a/popt.h b/popt.h
index 436f9f4..bb6a867 100644
--- a/popt.h
+++ b/popt.h
@@ -9,10 +9,6 @@
 #ifndef H_POPT
 #define H_POPT
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>			/* for FILE * */
 
 #define POPT_OPTION_DEPTH	10
@@ -184,6 +180,11 @@ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE,
 			  POPT_CALLBACK_REASON_POST,
 			  POPT_CALLBACK_REASON_OPTION };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*@-type@*/
+
 /** \ingroup popt
  * Table callback prototype.
  * @param con		context
@@ -437,6 +438,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	/*@modifies *argv @*/;
 /*@=fcnuse@*/
 
+/*@=type@*/
 #ifdef  __cplusplus
 }
 #endif