Minor fixes to be able to build on MBED from D Cristoloveanu - Avoid including Posix specific sys/types.h This closes #19
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3d43898a Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3d43898a Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3d43898a Branch: refs/heads/kgiusti-python3 Commit: 3d43898a3302cc9401b8fc76264898547d0e49ea Parents: 2f1a989 Author: dcristoloveanu <[email protected]> Authored: Tue Mar 17 09:55:58 2015 -0700 Committer: Andrew Stitcher <[email protected]> Committed: Fri Apr 24 16:31:48 2015 -0400 ---------------------------------------------------------------------- proton-c/include/proton/condition.h | 1 - proton-c/include/proton/connection.h | 1 - proton-c/include/proton/delivery.h | 1 - proton-c/include/proton/disposition.h | 1 - proton-c/include/proton/event.h | 1 - proton-c/include/proton/io.h | 2 +- proton-c/include/proton/link.h | 1 - proton-c/include/proton/message.h | 1 - proton-c/include/proton/sasl.h | 1 - proton-c/include/proton/scanner.h | 2 +- proton-c/include/proton/session.h | 1 - proton-c/include/proton/ssl.h | 1 - proton-c/include/proton/terminus.h | 1 - proton-c/include/proton/transport.h | 1 - proton-c/include/proton/type_compat.h | 11 ++++++++++- proton-c/include/proton/types.h | 2 +- proton-c/src/dispatcher/dispatcher.h | 1 - proton-c/src/framing/framing.h | 1 - proton-c/src/util.c | 1 - proton-c/src/util.h | 1 - 20 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/condition.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/condition.h b/proton-c/include/proton/condition.h index 6fe0333..34b2cbf 100644 --- a/proton-c/include/proton/condition.h +++ b/proton-c/include/proton/condition.h @@ -26,7 +26,6 @@ #include <proton/codec.h> #include <proton/type_compat.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/connection.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/connection.h b/proton-c/include/proton/connection.h index efc5a60..f8a688c 100644 --- a/proton-c/include/proton/connection.h +++ b/proton-c/include/proton/connection.h @@ -30,7 +30,6 @@ #include <proton/types.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/delivery.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/delivery.h b/proton-c/include/proton/delivery.h index f040f86..7eb0dfe 100644 --- a/proton-c/include/proton/delivery.h +++ b/proton-c/include/proton/delivery.h @@ -26,7 +26,6 @@ #include <proton/disposition.h> #include <proton/type_compat.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/disposition.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/disposition.h b/proton-c/include/proton/disposition.h index 0c5c58c..202f996 100644 --- a/proton-c/include/proton/disposition.h +++ b/proton-c/include/proton/disposition.h @@ -26,7 +26,6 @@ #include <proton/type_compat.h> #include <proton/condition.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/event.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/event.h b/proton-c/include/proton/event.h index ae559cc..43329c4 100644 --- a/proton-c/include/proton/event.h +++ b/proton-c/include/proton/event.h @@ -26,7 +26,6 @@ #include <proton/type_compat.h> #include <proton/object.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/io.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/io.h b/proton-c/include/proton/io.h index 36ffe23..19dfe53 100644 --- a/proton-c/include/proton/io.h +++ b/proton-c/include/proton/io.h @@ -24,8 +24,8 @@ #include <proton/import_export.h> #include <proton/error.h> -#include <sys/types.h> #include <proton/type_compat.h> +#include <stddef.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/link.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/link.h b/proton-c/include/proton/link.h index 531c399..d9ddca4 100644 --- a/proton-c/include/proton/link.h +++ b/proton-c/include/proton/link.h @@ -29,7 +29,6 @@ #include <proton/types.h> #include <proton/object.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/message.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/message.h b/proton-c/include/proton/message.h index d11a502..837b95e 100644 --- a/proton-c/include/proton/message.h +++ b/proton-c/include/proton/message.h @@ -26,7 +26,6 @@ #include <proton/types.h> #include <proton/codec.h> #include <proton/error.h> -#include <sys/types.h> #include <proton/type_compat.h> #ifdef __cplusplus http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/sasl.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/sasl.h b/proton-c/include/proton/sasl.h index f2d89a1..635e7a8 100644 --- a/proton-c/include/proton/sasl.h +++ b/proton-c/include/proton/sasl.h @@ -23,7 +23,6 @@ */ #include <proton/import_export.h> -#include <sys/types.h> #include <proton/type_compat.h> #include <proton/types.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/scanner.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/scanner.h b/proton-c/include/proton/scanner.h index aa33c96..10d7d32 100644 --- a/proton-c/include/proton/scanner.h +++ b/proton-c/include/proton/scanner.h @@ -23,7 +23,7 @@ */ #include <proton/import_export.h> -#include <sys/types.h> +#include <stddef.h> #include <stdarg.h> #ifdef __cplusplus http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/session.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/session.h b/proton-c/include/proton/session.h index 007b539..5dedb99 100644 --- a/proton-c/include/proton/session.h +++ b/proton-c/include/proton/session.h @@ -29,7 +29,6 @@ #include <proton/error.h> #include <proton/condition.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/ssl.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/ssl.h b/proton-c/include/proton/ssl.h index e8ab1e5..0ac4aef 100644 --- a/proton-c/include/proton/ssl.h +++ b/proton-c/include/proton/ssl.h @@ -23,7 +23,6 @@ */ #include <proton/import_export.h> -#include <sys/types.h> #include <proton/type_compat.h> #include <proton/types.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/terminus.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/terminus.h b/proton-c/include/proton/terminus.h index 375435d..b4bf6f8 100644 --- a/proton-c/include/proton/terminus.h +++ b/proton-c/include/proton/terminus.h @@ -26,7 +26,6 @@ #include <proton/type_compat.h> #include <proton/codec.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/transport.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/transport.h b/proton-c/include/proton/transport.h index 90244d5..d046567 100644 --- a/proton-c/include/proton/transport.h +++ b/proton-c/include/proton/transport.h @@ -26,7 +26,6 @@ #include <proton/type_compat.h> #include <proton/condition.h> #include <stddef.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/type_compat.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/type_compat.h b/proton-c/include/proton/type_compat.h index 9501d9a..e268b2a 100644 --- a/proton-c/include/proton/type_compat.h +++ b/proton-c/include/proton/type_compat.h @@ -62,6 +62,15 @@ // Determinine default action #ifndef _MSC_VER // Not Windows and not using Visual Studio + +/* MBED_BUILD_TIMESTAMP is used to detect whether Proton is being built on www.mbed.org with +the ARM compiler. In that case ssize_t needs to be defined in this file. */ +#if defined(MBED_BUILD_TIMESTAMP) +# define PNI_DEFINE_SSIZE_T +#else +#include <sys/types.h> +#endif /* defined(MBED_LIBRARY_VERSION) */ + # ifndef PNI_INCLUDE_STDINT # define PNI_INCLUDE_STDINT # endif @@ -108,7 +117,7 @@ # include <BaseTsd.h> typedef SSIZE_T ssize_t; # else -# error ssize_t definition not kown +typedef intptr_t ssize_t; # endif #endif // PNI_DEFINE_SSIZE_T http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/include/proton/types.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/types.h b/proton-c/include/proton/types.h index 9e0ea18..5ed4807 100644 --- a/proton-c/include/proton/types.h +++ b/proton-c/include/proton/types.h @@ -24,7 +24,7 @@ #include <proton/import_export.h> #include <stddef.h> -#include <sys/types.h> +#include <stdint.h> #include <proton/type_compat.h> /** http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/src/dispatcher/dispatcher.h ---------------------------------------------------------------------- diff --git a/proton-c/src/dispatcher/dispatcher.h b/proton-c/src/dispatcher/dispatcher.h index 752a71e..29881b5 100644 --- a/proton-c/src/dispatcher/dispatcher.h +++ b/proton-c/src/dispatcher/dispatcher.h @@ -22,7 +22,6 @@ * */ -#include <sys/types.h> #ifndef __cplusplus #include <stdbool.h> #endif http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/src/framing/framing.h ---------------------------------------------------------------------- diff --git a/proton-c/src/framing/framing.h b/proton-c/src/framing/framing.h index 9650979..d9fd550 100644 --- a/proton-c/src/framing/framing.h +++ b/proton-c/src/framing/framing.h @@ -24,7 +24,6 @@ #include <proton/import_export.h> #include <proton/type_compat.h> -#include <sys/types.h> #ifdef __cplusplus extern "C" { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/src/util.c ---------------------------------------------------------------------- diff --git a/proton-c/src/util.c b/proton-c/src/util.c index ec22db1..d0aa6b0 100644 --- a/proton-c/src/util.c +++ b/proton-c/src/util.c @@ -22,7 +22,6 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <sys/types.h> #include <proton/type_compat.h> #include <ctype.h> #include <string.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3d43898a/proton-c/src/util.h ---------------------------------------------------------------------- diff --git a/proton-c/src/util.h b/proton-c/src/util.h index 13348a9..8406747 100644 --- a/proton-c/src/util.h +++ b/proton-c/src/util.h @@ -29,7 +29,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> #include <proton/types.h> #include <proton/object.h> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
