summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevon <mythtv@reidsresidence.com>2012-04-10 18:45:14 (GMT)
committer Gavin Hurlbut <ghurlbut@mythtv.org>2012-04-10 18:46:16 (GMT)
commit19a7e0131146d38bfe384da55fc4c16193f2b54e (patch)
tree8b17d775305705764d14470a34002721abb55231
parentbb58a94fb5c1b205cab30cba5a109605a3288e1b (diff)
Make mythtv more compatible with GCC 4.7
Fixes #10537 Signed-off-by: Gavin Hurlbut <ghurlbut@mythtv.org>
-rw-r--r--mythplugins/mythzoneminder/mythzmserver/zmserver.cpp3
-rw-r--r--mythtv/libs/libmyth/rssparse.h1
-rw-r--r--mythtv/libs/libmythbase/compat.h2
-rw-r--r--mythtv/libs/libmythtv/audioinput.h1
4 files changed, 4 insertions, 3 deletions
diff --git a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
index 6ddda9b..ea1aa17 100644
--- a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
+++ b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
@@ -24,10 +24,7 @@
#include <netinet/in.h>
#include <sys/stat.h>
#include <sys/shm.h>
-
-#if _POSIX_MAPPED_FILES > 0L
#include <sys/mman.h>
-#endif
#ifdef linux
# include <sys/vfs.h>
diff --git a/mythtv/libs/libmyth/rssparse.h b/mythtv/libs/libmyth/rssparse.h
index 7408ac4..dfe1427 100644
--- a/mythtv/libs/libmyth/rssparse.h
+++ b/mythtv/libs/libmyth/rssparse.h
@@ -13,6 +13,7 @@ using namespace std;
#include <QPair>
#include <QMap>
#include <QVariant>
+#include <sys/types.h>
#include "mythexp.h"
diff --git a/mythtv/libs/libmythbase/compat.h b/mythtv/libs/libmythbase/compat.h
index ff2890f..425624a 100644
--- a/mythtv/libs/libmythbase/compat.h
+++ b/mythtv/libs/libmythbase/compat.h
@@ -44,6 +44,8 @@
# include <sys/resource.h> // for setpriority
# include <sys/socket.h>
# include <sys/wait.h> // For WIFEXITED on Mac OS X
+# include <stdio.h> // for snprintf(), used by inline dlerror()
+# include <unistd.h> // for usleep()
#endif
#ifdef USING_MINGW
diff --git a/mythtv/libs/libmythtv/audioinput.h b/mythtv/libs/libmythtv/audioinput.h
index 67f05d1..9155349 100644
--- a/mythtv/libs/libmythtv/audioinput.h
+++ b/mythtv/libs/libmythtv/audioinput.h
@@ -22,6 +22,7 @@
#define _AUDIOINPUT_H_
#include <QString>
+#include <unistd.h>
class AudioInput
{