mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-12-23 04:41:12 +00:00
strat: only include windows.h in translation units where actually needed
This commit is contained in:
parent
000713186f
commit
ca142889c4
17 changed files with 28 additions and 7 deletions
|
@ -24,10 +24,6 @@
|
||||||
/* libvapours (pulls in util, svc, results). */
|
/* libvapours (pulls in util, svc, results). */
|
||||||
#include <vapours.hpp>
|
#include <vapours.hpp>
|
||||||
|
|
||||||
#if defined(ATMOSPHERE_OS_WINDOWS)
|
|
||||||
#include <stratosphere/windows.hpp>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Libstratosphere diagnostics. */
|
/* Libstratosphere diagnostics. */
|
||||||
#include <stratosphere/diag.hpp>
|
#include <stratosphere/diag.hpp>
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include <ntstatus.h>
|
#include <ntstatus.h>
|
||||||
#include <bcrypt.h>
|
#include <bcrypt.h>
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
|
||||||
#if defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
|
#if defined(ATMOSPHERE_OS_WINDOWS)
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
#elif defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
#include "diag_dump_stack_trace.hpp"
|
#include "diag_dump_stack_trace.hpp"
|
||||||
|
|
||||||
|
#if defined(ATMOSPHERE_OS_WINDOWS)
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace ams::diag::impl {
|
namespace ams::diag::impl {
|
||||||
|
|
||||||
#if defined(AMS_BUILD_FOR_DEBUGGING) || defined(AMS_BUILD_FOR_DEBUGGING)
|
#if defined(AMS_BUILD_FOR_DEBUGGING) || defined(AMS_BUILD_FOR_DEBUGGING)
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include "diag_symbol_impl.hpp"
|
#include "diag_symbol_impl.hpp"
|
||||||
|
|
||||||
#include <cxxabi.h>
|
#include <cxxabi.h>
|
||||||
|
|
|
@ -16,7 +16,10 @@
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
#include "fssrv_utility.hpp"
|
#include "fssrv_utility.hpp"
|
||||||
|
|
||||||
#if defined(ATMOSPHERE_OS_LINUX)
|
|
||||||
|
#if defined(ATMOSPHERE_OS_WINDOWS)
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
#elif defined(ATMOSPHERE_OS_LINUX)
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#elif defined(ATMOSPHERE_OS_MACOS)
|
#elif defined(ATMOSPHERE_OS_MACOS)
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
#if defined(ATMOSPHERE_OS_WINDOWS)
|
#if defined(ATMOSPHERE_OS_WINDOWS)
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include <winerror.h>
|
#include <winerror.h>
|
||||||
#include <winioctl.h>
|
#include <winioctl.h>
|
||||||
#elif defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
|
#elif defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include <VersionHelpers.h>
|
#include <VersionHelpers.h>
|
||||||
#include "mem_impl_platform.hpp"
|
#include "mem_impl_platform.hpp"
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include "os_giant_lock.os.windows.hpp"
|
#include "os_giant_lock.os.windows.hpp"
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include "os_inter_process_event.hpp"
|
#include "os_inter_process_event.hpp"
|
||||||
#include "os_inter_process_event_impl.os.windows.hpp"
|
#include "os_inter_process_event_impl.os.windows.hpp"
|
||||||
#include "os_giant_lock.hpp"
|
#include "os_giant_lock.hpp"
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include "os_internal_critical_section_impl.os.windows.hpp"
|
#include "os_internal_critical_section_impl.os.windows.hpp"
|
||||||
#include "os_timeout_helper.hpp"
|
#include "os_timeout_helper.hpp"
|
||||||
#include "os_thread_manager.hpp"
|
#include "os_thread_manager.hpp"
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
#include "os_internal_critical_section_impl.os.windows.hpp"
|
#include "os_internal_critical_section_impl.os.windows.hpp"
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace ams::os::impl {
|
||||||
NON_COPYABLE(ThreadManagerWindowsImpl);
|
NON_COPYABLE(ThreadManagerWindowsImpl);
|
||||||
NON_MOVEABLE(ThreadManagerWindowsImpl);
|
NON_MOVEABLE(ThreadManagerWindowsImpl);
|
||||||
private:
|
private:
|
||||||
DWORD m_tls_index;
|
u32 m_tls_index;
|
||||||
public:
|
public:
|
||||||
explicit ThreadManagerWindowsImpl(ThreadType *main_thread);
|
explicit ThreadManagerWindowsImpl(ThreadType *main_thread);
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <stratosphere.hpp>
|
#include <stratosphere.hpp>
|
||||||
|
|
||||||
|
#if defined(ATMOSPHERE_OS_WINDOWS)
|
||||||
|
#include <stratosphere/windows.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
|
|
||||||
namespace ams::os::impl {
|
namespace ams::os::impl {
|
||||||
|
|
Loading…
Reference in a new issue