1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From fb38e225ea67d1c94183397046490743e41ff3ab Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <locutusofborg@debian.org>
Date: Thu, 12 Dec 2024 12:00:52 +0100
Subject: [PATCH] simplify the definition of speed_t across all the different
OSes (MAC/WIN/LINUX)
---
parser/qdltparser.h | 1 -
qdlt/dlt_common.h | 2 ++
qdlt/dlt_types.h | 5 -----
3 files changed, 2 insertions(+), 6 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 <QFile>
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 <termios.h>
+#else
+typedef unsigned int speed_t;
#endif
#include "dlt_types.h"
diff --git a/qdlt/dlt_types.h b/qdlt/dlt_types.h
index d4494abe..ac6ea300 100644
--- a/qdlt/dlt_types.h
+++ b/qdlt/dlt_types.h
@@ -59,11 +59,6 @@
typedef int pid_t;
#endif
-#ifdef __APPLE__
-typedef unsigned long speed_t;
-#else
-typedef unsigned int speed_t;
-#endif
typedef float float32_t;
typedef double float64_t;
|
