[2/3] checkpolicy: always include ctypes.h

Commit Message

Nicolas Iooss Jan. 8, 2017, 6:45 p.m. UTC

The prototype of isdigit() is provided by ctypes.h header. Without
including this file, gcc fails to build checkpolicy using musl libc:

    checkpolicy.c: In function ‘main’:
    checkpolicy.c:705:8: error: implicit declaration of function
    ‘isdigit’ [-Werror=implicit-function-declaration]
        if (isdigit(ans[0])) {
            ^~~~~~~

Signed-off-by: Nicolas Iooss <[e-mail]>
---
 checkpolicy/checkpolicy.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Stephen Smalley Jan. 9, 2017, 9:04 p.m. UTC | #1

On Sun, 2017-01-08 at 19:45 +0100, Nicolas Iooss wrote:
> The prototype of isdigit() is provided by ctypes.h header. Without
> including this file, gcc fails to build checkpolicy using musl libc:
> 
>     checkpolicy.c: In function ‘main’:
>     checkpolicy.c:705:8: error: implicit declaration of function
>     ‘isdigit’ [-Werror=implicit-function-declaration]
>         if (isdigit(ans[0])) {
>             ^~~~~~~
> 
> Signed-off-by: Nicolas Iooss <[e-mail]>

Thanks, applied all three.

> ---
>  checkpolicy/checkpolicy.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c
> index 2d68316dc07b..c82f6f409271 100644
> --- a/checkpolicy/checkpolicy.c
> +++ b/checkpolicy/checkpolicy.c
> @@ -57,6 +57,7 @@
>   * booleans or conditional rules are thrown away a warning is
> printed.
>   */
>  
> +#include <ctype.h>
>  #include <getopt.h>
>  #include <unistd.h>
>  #include <stdlib.h>
> @@ -73,10 +74,6 @@
>  #include <errno.h>
>  #include <sys/mman.h>
>  
> -#ifdef __APPLE__
> -#include <ctype.h>
> -#endif
> -
>  #include <sepol/module_to_cil.h>
>  #include <sepol/policydb/policydb.h>
>  #include <sepol/policydb/services.h>

Patch

diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c
index 2d68316dc07b..c82f6f409271 100644
--- a/checkpolicy/checkpolicy.c
+++ b/checkpolicy/checkpolicy.c
@@ -57,6 +57,7 @@ 
  * booleans or conditional rules are thrown away a warning is printed.
  */
 
+#include <ctype.h>
 #include <getopt.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -73,10 +74,6 @@ 
 #include <errno.h>
 #include <sys/mman.h>
 
-#ifdef __APPLE__
-#include <ctype.h>
-#endif
-
 #include <sepol/module_to_cil.h>
 #include <sepol/policydb/policydb.h>
 #include <sepol/policydb/services.h>