summaryrefslogtreecommitdiff
blob: 5a6009b21859ac4bbedfc93cba6c8286d985f030 (plain)
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
Description: Fix compilation with gcc 4.7
Author: John Stamp <jstamp@users.sourceforge.net>
http://bugs.debian.org/667236
https://bugs.gentoo.org/show_bug.cgi?id=423221
--- a/src/libUnicorn/UnicornCommon.cpp
+++ b/src/libUnicorn/UnicornCommon.cpp
@@ -32,6 +32,8 @@
 #ifdef WIN32
     #include <windows.h>
     #include <shlobj.h>
+#else
+    #include <unistd.h>
 #endif
 
 using namespace std;
--- a/src/lastfmapplication.cpp
+++ b/src/lastfmapplication.cpp
@@ -59,6 +59,8 @@
 
 #ifdef WIN32
     #include <windows.h>
+#else
+    #include <unistd.h>
 #endif
 
 #ifdef Q_WS_MAC
--- a/src/libUnicorn/Settings.h
+++ b/src/libUnicorn/Settings.h
@@ -105,7 +105,7 @@
     public:
         MyQSettings( const UserSettings* const s )
         {
-            beginGroup( s->username() );
+            this->beginGroup( s->username() );
         }
     };
 
--- a/src/playerlistener.cpp
+++ b/src/playerlistener.cpp
@@ -33,6 +33,10 @@
 #include <iostream>
 #include <algorithm>
 
+#ifdef Q_OS_UNIX
+    #include <unistd.h>
+#endif
+
 using namespace std;