From 73cb0f41e224c11afd6572fe19bd5702fad2026b Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@darkbeer.org>
Date: Wed, 15 Jan 2014 19:08:51 +0000
Subject: [PATCH] Fix build for FreeBSD 10.0 + clang.
---
mythtv/libs/libmyth/remoteutil.h | 2 ++
mythtv/libs/libmythbase/mythmiscutil.h | 1 +
mythtv/libs/libmythbase/mythsystemlegacy.h | 1 +
mythtv/libs/libmythbase/mythtimezone.cpp | 1 +
mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +++++-
mythtv/libs/libmythui/mythgesture.cpp | 1 +
mythtv/libs/libmythui/mythpainter.cpp | 1 +
mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 ++++
8 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/mythtv/libs/libmyth/remoteutil.h b/mythtv/libs/libmyth/remoteutil.h
index 7acff6a..4dc6a54 100644
a
|
b
|
|
1 | 1 | #ifndef REMOTEUTIL_H_ |
2 | 2 | #define REMOTEUTIL_H_ |
3 | 3 | |
| 4 | #include <time.h> |
| 5 | |
4 | 6 | #include <QStringList> |
5 | 7 | #include <QDateTime> |
6 | 8 | |
diff --git a/mythtv/libs/libmythbase/mythmiscutil.h b/mythtv/libs/libmythbase/mythmiscutil.h
index bfb171e..91dea13 100644
a
|
b
|
|
2 | 2 | #define MYTHMISCUTIL_H_ |
3 | 3 | |
4 | 4 | #include <stdint.h> |
| 5 | #include <time.h> |
5 | 6 | |
6 | 7 | #include <algorithm> |
7 | 8 | using namespace std; |
diff --git a/mythtv/libs/libmythbase/mythsystemlegacy.h b/mythtv/libs/libmythbase/mythsystemlegacy.h
index 7a980a7..52d98ac 100644
a
|
b
|
|
42 | 42 | |
43 | 43 | // C headers |
44 | 44 | #include <stdint.h> |
| 45 | #include <time.h> |
45 | 46 | |
46 | 47 | #ifdef __cplusplus |
47 | 48 | |
diff --git a/mythtv/libs/libmythbase/mythtimezone.cpp b/mythtv/libs/libmythbase/mythtimezone.cpp
index 424bf7b..6a081a4 100644
a
|
b
|
|
1 | 1 | #include "mythtimezone.h" |
2 | 2 | |
3 | 3 | #include <stdlib.h> // for malloc, getenv |
| 4 | #include <time.h> |
4 | 5 | |
5 | 6 | #include <QDataStream> |
6 | 7 | #include <QTextStream> |
diff --git a/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp
index dc57840..f8e579a 100644
a
|
b
|
|
28 | 28 | #include <errno.h> |
29 | 29 | #include <ctype.h> |
30 | 30 | #include <linux/dvb/ca.h> |
31 | | #include <malloc.h> |
| 31 | #ifdef __FreeBSD__ |
| 32 | # include <stdlib.h> |
| 33 | #else |
| 34 | # include <malloc.h> |
| 35 | #endif |
32 | 36 | #include <netinet/in.h> |
33 | 37 | #include <poll.h> |
34 | 38 | #include <string.h> |
diff --git a/mythtv/libs/libmythui/mythgesture.cpp b/mythtv/libs/libmythui/mythgesture.cpp
index 37846e4..f020f1a 100644
a
|
b
|
|
30 | 30 | |
31 | 31 | #include <cmath> |
32 | 32 | #include <algorithm> |
| 33 | #include <complex> |
33 | 34 | |
34 | 35 | #include <QMutex> |
35 | 36 | #include <QMap> |
diff --git a/mythtv/libs/libmythui/mythpainter.cpp b/mythtv/libs/libmythui/mythpainter.cpp
index f2482f1..5d17684 100644
a
|
b
|
|
1 | 1 | #include <stdint.h> |
2 | 2 | #include <algorithm> |
| 3 | #include <complex> |
3 | 4 | |
4 | 5 | // QT headers |
5 | 6 | #include <QRect> |
diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.h b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h
index 83572d4..b9b75a5 100644
a
|
b
|
|
13 | 13 | #ifndef _MULTICAST_SOCKET_DEVICE_H_ |
14 | 14 | #define _MULTICAST_SOCKET_DEVICE_H_ |
15 | 15 | |
| 16 | #ifdef __FreeBSD__ // for u_char, u_short |
| 17 | #include <sys/types.h> |
| 18 | #endif |
| 19 | |
16 | 20 | #ifdef _WIN32 |
17 | 21 | # include <ws2tcpip.h> |
18 | 22 | #else |