diff options
| author | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-12-21 17:49:45 +0200 |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-12-21 15:58:11 +0000 |
| commit | 16bb0eace6343a17886f899adfc486c6b5b78c46 (patch) | |
| tree | bd7a1bf2687f4b613e4ce4fec11bad76a26f654f | |
| parent | 9d2d40140b8a9903d0d1b761efc8663a031e3950 (diff) | |
Fix Integrity build
CI's Integrity build picks up system headers in odd order.
Guard size_t with define found from sys/types.h
Change-Id: Icd6a796d9754da547682a246e7d4a5dc56582c4b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | UnknownVersion/include/EABase/eabase.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/UnknownVersion/include/EABase/eabase.h b/UnknownVersion/include/EABase/eabase.h index 5ba11cc..6752124 100644 --- a/UnknownVersion/include/EABase/eabase.h +++ b/UnknownVersion/include/EABase/eabase.h @@ -662,6 +662,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // signed equivalent to size_t. // This is defined by GCC but not by other compilers. // +#if !defined(_SIZE_T) #if !defined(__GNUC__) // As of this writing, all non-GCC compilers significant to us implement // uintptr_t the same as size_t. However, this isn't guaranteed to be @@ -674,7 +675,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #elif defined(EA_PLATFORM_UNIX) || defined(EA_PLATFORM_MINGW) || defined(__APPLE__) || defined(_BSD_SIZE_T_) // _BSD_SIZE_T_ indicates that Unix-like headers are present, even though it may not be a true Unix platform. # include <sys/types.h> #endif - +#endif // ------------------------------------------------------------------------ // Character types |