diff options
| author | nakeee <nakeee@gmail.com> | 2009-03-30 16:30:31 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-03-30 16:30:31 +0000 |
| commit | 6b2b1a34ee079f1c3fb8d3ac0d1d41dfbe9a3866 (patch) | |
| tree | cb1e8d582d31cd5cb7e8dd149e80117b93af03b4 /Source/Core | |
| parent | f2a7da4611cef9034cacb91846408177cb71f21f (diff) | |
Linux compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2804 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/AudioCommon/Src/OpenALStream.h | 6 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/aldlist.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index bed5d724f1..9398474d58 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -43,11 +43,7 @@ public: virtual bool usesMixer() const { return true; }
virtual void Update();
-#ifdef _WIN32
- static DWORD WINAPI ThreadFunc(void* args);
-#else
- static void* soundThread(void* args);
-#endif
+ static THREAD_RETURN ThreadFunc(void* args);
private:
Common::Thread *thread;
diff --git a/Source/Core/AudioCommon/Src/aldlist.h b/Source/Core/AudioCommon/Src/aldlist.h index 187bc6c950..cea2fe41f6 100644 --- a/Source/Core/AudioCommon/Src/aldlist.h +++ b/Source/Core/AudioCommon/Src/aldlist.h @@ -2,8 +2,10 @@ #define ALDEVICELIST_H
#include "CommonTypes.h"
-
-#pragma warning(disable: 4786) //disable warning "identifier was truncated to '255' characters in the browser information"
+#ifdef _WIN32
+#pragma warning(disable: 4786) //disable warning "identifier was truncated to
+ //'255' characters in the browser information"
+#endif
#include <vector>
#include <string>
|