From 2edbc8c8c1efaa97867e493f46c37b677741cf94 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sun, 6 Feb 2011 19:50:59 +0000 Subject: [PATCH] Fix mutex.h so we can actually use it. Originally committed to SVN as r5309. --- aegisub/libaegisub/include/libaegisub/mutex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/libaegisub/include/libaegisub/mutex.h b/aegisub/libaegisub/include/libaegisub/mutex.h index 367f0bcba..1e3f854a1 100644 --- a/aegisub/libaegisub/include/libaegisub/mutex.h +++ b/aegisub/libaegisub/include/libaegisub/mutex.h @@ -102,7 +102,7 @@ #ifndef GOOGLE_MUTEX_H_ #define GOOGLE_MUTEX_H_ -#include "../../config.h" // to figure out pthreads support +#include "acconf.h" // to figure out pthreads support #if defined(NO_THREADS) typedef int MutexType; // to keep a lock-count @@ -146,7 +146,7 @@ #include #include // for abort() -#define MUTEX_NAMESPACE glog_internal_namespace_ +#define MUTEX_NAMESPACE agi namespace MUTEX_NAMESPACE {