piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

This change might work better if I git add the files

Browse Source
This commit is contained in:
Pierre Bourdon
2013-03-29 07:31:15 -07:00
parent b73941c0ea
commit 4895e38bd5
11 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Common/Src/Thread.h
View File

@ -18,9 +18,16 @@
#ifndef _THREAD_H_
#define _THREAD_H_
#include "StdThread.h"
#include "StdMutex.h"
#include "StdConditionVariable.h"
// <condition_variable> has a bug in some versions of libc++: it uses _ as a variable.
// This conflicts with gettext's use of _ as a macro.
#undef _
#include <condition_variable>
#include <mutex>
#include <thread>
// Restore _
#define _(s) wxGetTranslation((s))
// Don't include common.h here as it will break LogManager
#include "CommonTypes.h"