From aa4e85105675ed350a2a85174e7197993d1c37c7 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 21 Jul 2024 18:51:27 +0200 Subject: [PATCH] Fix build by avoiding to include Qt headers in plain c header files, making some compilers error out --- parser/qdltparser.h | 1 - qdlt/dlt_common.h | 2 ++ qdlt/dlt_types.h | 5 ----- qdlt/export_rules.h | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/parser/qdltparser.h b/parser/qdltparser.h index ac14f611..0d4e8309 100644 --- a/parser/qdltparser.h +++ b/parser/qdltparser.h @@ -32,7 +32,6 @@ #include typedef int pid_t; -typedef unsigned int speed_t; typedef float float32_t; typedef double float64_t; diff --git a/qdlt/dlt_common.h b/qdlt/dlt_common.h index e853fa3d..200c3825 100644 --- a/qdlt/dlt_common.h +++ b/qdlt/dlt_common.h @@ -81,6 +81,8 @@ #if !defined (__WIN32__) && !defined(_MSC_VER) #include +#else +typedef unsigned int speed_t; #endif #include "dlt_types.h" diff --git a/qdlt/dlt_types.h b/qdlt/dlt_types.h index d806c639..ac6ea300 100644 --- a/qdlt/dlt_types.h +++ b/qdlt/dlt_types.h @@ -59,11 +59,6 @@ typedef int pid_t; #endif -#ifdef TARGET_OS_MAC -typedef unsigned long speed_t; -#else -typedef unsigned int speed_t; -#endif typedef float float32_t; typedef double float64_t; diff --git a/qdlt/export_rules.h b/qdlt/export_rules.h index 61e79ed5..37da2622 100644 --- a/qdlt/export_rules.h +++ b/qdlt/export_rules.h @@ -1,5 +1,3 @@ -#include - #ifndef EXPORT_RULES_H #define EXPORT_RULES_H