Fixed stdint.h and stdbool.h detection.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b7cd6b..ae229eb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -361,8 +361,6 @@ if(NOT IOS)
        check_include_files(fcntl.h HAVE_FCNTL_H)
        check_include_files(unistd.h HAVE_UNISTD_H)
        check_include_files(execinfo.h HAVE_EXECINFO_H)
-       check_include_files(stdint.h HAVE_STDINT_H)
-       check_include_files(stdbool.h HAVE_STDBOOL_H)
        check_include_files(inttypes.h HAVE_INTTYPES_H)
        check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
        check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
@@ -373,8 +371,6 @@ if(NOT IOS)
 else()
        set(HAVE_FCNTL_H 1)
        set(HAVE_UNISTD_H 1)
-       set(HAVE_STDINT_H 1)
-       set(HAVE_STDBOOL_H 0)
        set(HAVE_INTTYPES_H 1)
        set(HAVE_SYS_FILIO_H 1)
 endif()

diff --git a/config.h.in b/config.h.in
index 9dc44bd..df24a30 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -4,8 +4,6 @@
 /* Include files */
 #cmakedefine HAVE_FCNTL_H
 #cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_STDINT_H
-#cmakedefine HAVE_STDBOOL_H
 #cmakedefine HAVE_INTTYPES_H
 #cmakedefine HAVE_SYS_MODEM_H
 #cmakedefine HAVE_SYS_FILIO_H

diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c
index 859a208..cff1768 100644 (file)
--- a/libfreerdp/codec/nsc.c
+++ b/libfreerdp/codec/nsc.c
@@ -26,10 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #include <winpr/crt.h>
 
 #include <freerdp/codec/nsc.h>

diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c
index c015025..2477c65 100644 (file)
--- a/libfreerdp/codec/nsc_encode.c
+++ b/libfreerdp/codec/nsc_encode.c
@@ -25,10 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #include <winpr/crt.h>
 
 #include <freerdp/codec/nsc.h>

diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
index cc8a61c..e3a36ba 100644 (file)
--- a/libfreerdp/codec/rfx.c
+++ b/libfreerdp/codec/rfx.c
@@ -28,10 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #include <winpr/crt.h>
 #include <winpr/tchar.h>
 #include <winpr/sysinfo.h>

diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index c071b3b..d3bb446 100644 (file)
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -55,6 +55,14 @@ set(WINPR_VERSION "${WINPR_VERSION_MAJOR}.${WINPR_VERSION_MINOR}.${WINPR_VERSION
 set(WINPR_VERSION_FULL "${WINPR_VERSION}")
 set(WINPR_API_VERSION "${WINPR_VERSION_MAJOR}")
 
+if(NOT IOS)
+       check_include_files(stdbool.h WINPR_HAVE_STDBOOL_H)
+       check_include_files(stdint.h WINPR_HAVE_STDINT_H)
+else(NOT IOS)
+       set(WINPR_HAVE_STDBOOL_H 1)
+       set(WINPR_HAVE_STDINT_H 1)
+endif(NOT IOS)
+
 if(FREERDP_BUILD)
        set(WINPR_VERSION_FULL ${WINPR_VERSION_FULL} PARENT_SCOPE)
        set(WINPR_VERSION ${WINPR_VERSION} PARENT_SCOPE)
@@ -70,7 +78,6 @@ else()
                check_include_files(fcntl.h HAVE_FCNTL_H)
                check_include_files(unistd.h HAVE_UNISTD_H)
                check_include_files(execinfo.h HAVE_EXECINFO_H)
-               check_include_files(stdint.h HAVE_STDINT_H)
                check_include_files(inttypes.h HAVE_INTTYPES_H)
                check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
                check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
@@ -80,7 +87,6 @@ else()
        else()
                set(HAVE_FCNTL_H 1)
                set(HAVE_UNISTD_H 1)
-               set(HAVE_STDINT_H 1)
                set(HAVE_INTTYPES_H 1)
                set(HAVE_SYS_FILIO_H 1)
        endif()

diff --git a/winpr/include/winpr/wtypes.h.in b/winpr/include/winpr/wtypes.h.in
index 39d6486..a33b65a 100644 (file)
--- a/winpr/include/winpr/wtypes.h.in
+++ b/winpr/include/winpr/wtypes.h.in
@@ -21,18 +21,10 @@
 #define WINPR_WTYPES_H
 
 /* Set by CMake during configuration. */
-#if defined @HAVE_STDINT_H@
-#define WINPR_HAVE_STDINT_H 1
-#else
-#define WINPR_HAVE_STDINT_H 0
-#endif
+#cmakedefine01 WINPR_HAVE_STDINT_H
 
 /* Set by CMake during configuration. */
-#if defined @HAVE_STDBOOL_H@
-#define WINPR_HAVE_STDBOOL_H 1
-#else
-#define WINPR_HAVE_STDBOOL_H 0
-#endif
+#cmakedefine01 WINPR_HAVE_STDBOOL_H
 
 /* MSDN: Windows Data Types - http://msdn.microsoft.com/en-us/library/aa383751/ */
 /* [MS-DTYP]: Windows Data Types - http://msdn.microsoft.com/en-us/library/cc230273/ */