From d2619e94ecf1ddac84ee004e6bf1285129f2967f Mon Sep 17 00:00:00 2001
From: DHrpcs3 <dh.rpcs3@gmail.com>
Date: Mon, 21 Dec 2015 15:08:18 +0200
Subject: [PATCH] Relative includes in headers

---
 common.vcxproj               | 8 ++++----
 include/common/File.h        | 2 +-
 include/common/SharedMutex.h | 2 +-
 include/common/SleepQueue.h  | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common.vcxproj b/common.vcxproj
index ac4b195..adde5dc 100644
--- a/common.vcxproj
+++ b/common.vcxproj
@@ -100,22 +100,22 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
     <IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
     <IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
     <IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
     <IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
   </PropertyGroup>
diff --git a/include/common/File.h b/include/common/File.h
index ba735ec..68a2c3f 100644
--- a/include/common/File.h
+++ b/include/common/File.h
@@ -2,7 +2,7 @@
 #include "types.h"
 #include <vector>
 #include <type_traits>
-#include <StrFmt.h>
+#include "StrFmt.h"
 
 enum class fsm : u32 // file seek mode
 {
diff --git a/include/common/SharedMutex.h b/include/common/SharedMutex.h
index 2b09938..47761cc 100644
--- a/include/common/SharedMutex.h
+++ b/include/common/SharedMutex.h
@@ -3,7 +3,7 @@
 #include <thread>
 #include <mutex>
 #include <atomic>
-#include <Atomic.h>
+#include "Atomic.h"
 
 //! An attempt to create effective implementation of "shared mutex", lock-free in optimistic case.
 //! All locking and unlocking may be done by single LOCK XADD or LOCK CMPXCHG instructions.
diff --git a/include/common/SleepQueue.h b/include/common/SleepQueue.h
index 1de522f..df4315e 100644
--- a/include/common/SleepQueue.h
+++ b/include/common/SleepQueue.h
@@ -2,10 +2,12 @@
 #include <deque>
 #include <memory>
 
-struct sleep_entry_t : std::enable_shared_from_this<sleep_entry_t>
+struct sleep_entry_t : protected std::enable_shared_from_this<sleep_entry_t>
 {
 	virtual void sleep() = 0;
 	virtual void awake() = 0;
+
+	friend class sleep_queue_entry_t;
 };
 
 using sleep_queue_t = std::deque<std::shared_ptr<sleep_entry_t>>;