mirror of
https://github.com/reactos/reactos.git
synced 2025-05-28 05:28:14 +00:00
[CMAKE][NTOS]
* Improve some inclusions (avoid ../ types). * The answer is 42. svn path=/trunk/; revision=65357
This commit is contained in:
parent
d65a3b59a3
commit
f57a299104
42 changed files with 54 additions and 53 deletions
4
reactos/ntoskrnl/cache/section/data.c
vendored
4
reactos/ntoskrnl/cache/section/data.c
vendored
|
@ -76,10 +76,10 @@ entry.
|
|||
|
||||
#include <ntoskrnl.h>
|
||||
#include "newmm.h"
|
||||
#include "../newcc.h"
|
||||
#include <cache/newcc.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include "../mm/ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#define DPRINTC DPRINT
|
||||
|
||||
|
|
2
reactos/ntoskrnl/cache/section/fault.c
vendored
2
reactos/ntoskrnl/cache/section/fault.c
vendored
|
@ -77,7 +77,7 @@ rmaps, so each mapping should be immediately followed by an rmap addition.
|
|||
#include "newmm.h"
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include "../mm/ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#define DPRINTC DPRINT
|
||||
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef _M_IX86
|
||||
#include "../i386/intrin_i.h"
|
||||
#include <internal/i386/intrin_i.h>
|
||||
#elif defined(_M_PPC)
|
||||
#include "../powerpc/intrin_i.h"
|
||||
#include <internal/powerpc/intrin_i.h>
|
||||
#elif defined(_M_MIPS)
|
||||
#include "../mips/intrin_i.h"
|
||||
#include <internal/mips/intrin_i.h>
|
||||
#elif defined(_M_ARM)
|
||||
#include "../arm/intrin_i.h"
|
||||
#include <internal/arm/intrin_i.h>
|
||||
#elif defined(_M_AMD64)
|
||||
#include "../amd64/intrin_i.h"
|
||||
#include <internal/amd64/intrin_i.h>
|
||||
#else
|
||||
#error "Unknown processor"
|
||||
#endif
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef _M_IX86
|
||||
#include "../i386/ke.h"
|
||||
#include <internal/i386/ke.h>
|
||||
#elif defined(_M_PPC)
|
||||
#include "../powerpc/ke.h"
|
||||
#include <internal/powerpc/ke.h>
|
||||
#elif defined(_M_MIPS)
|
||||
#include "../mips/ke.h"
|
||||
#include <internal/mips/ke.h>
|
||||
#elif defined(_M_ARM)
|
||||
#include "../arm/ke.h"
|
||||
#include <internal/arm/ke.h>
|
||||
#elif defined(_M_AMD64)
|
||||
#include "../amd64/ke.h"
|
||||
#include <internal/amd64/ke.h>
|
||||
#else
|
||||
#error "Unknown processor"
|
||||
#endif
|
||||
|
|
|
@ -80,7 +80,7 @@
|
|||
#include "lpc.h"
|
||||
#include "rtl.h"
|
||||
#ifdef KDBG
|
||||
#include "../kdbg/kdb.h"
|
||||
#include <kdbg/kdb.h>
|
||||
#endif
|
||||
#include "dbgk.h"
|
||||
#include "spinlock.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <ntoskrnl.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include "../mm/ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
#undef MmSystemRangeStart
|
||||
|
||||
VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <ntoskrnl.h>
|
||||
|
||||
#define NDEBUG
|
||||
#include "../cache/section/newmm.h"
|
||||
#include <cache/section/newmm.h>
|
||||
#include <debug.h>
|
||||
|
||||
/* GLOBALS ******************************************************************/
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* PRIVATE FUNCTIONS **********************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS *******************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* FUNCTIONS *****************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#undef ExAllocatePoolWithQuota
|
||||
#undef ExAllocatePoolWithQuotaTag
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#ifndef _WINKD_
|
||||
#define KdpDprintf DPRINT
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#if DBG
|
||||
#define ASSERT_LIST_INVARIANT(x) \
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
extern ULONG ExpPoolFlags;
|
||||
extern PMMPTE MmSystemPteBase;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GCC's incompetence strikes again */
|
||||
__inline
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* Include Mm version of AVL support */
|
||||
#include "../ARM3/miavl.h"
|
||||
#include "../../../lib/rtl/avlsupp.c"
|
||||
#include "miavl.h"
|
||||
#include <lib/rtl/avlsupp.c>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#define MI_MAPPED_COPY_PAGES 14
|
||||
#define MI_POOL_COPY_BYTES 512
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
//#define NDEBUG
|
||||
#include <debug.h>
|
||||
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#ifdef _WINKD_
|
||||
extern PMMPTE MmDebugPte;
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <ntoskrnl.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#undef InterlockedExchangePte
|
||||
#define InterlockedExchangePte(pte1, pte2) \
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <debug.h>
|
||||
|
||||
#define MODULE_INVOLVED_IN_ARM3
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include <ntoskrnl.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include "../ARM3/miarm.h"
|
||||
#include <mm/ARM3/miarm.h>
|
||||
|
||||
#if defined (ALLOC_PRAGMA)
|
||||
#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory)
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <ntoskrnl.h>
|
||||
#define NDEBUG
|
||||
#include "../cache/section/newmm.h"
|
||||
#include <cache/section/newmm.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include "ARM3/miarm.h"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
/* INCLUDES *******************************************************************/
|
||||
|
||||
#include <ntoskrnl.h>
|
||||
#include "../cache/section/newmm.h"
|
||||
#include <cache/section/newmm.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
/* INCLUDES *****************************************************************/
|
||||
|
||||
#include <ntoskrnl.h>
|
||||
#include "../cache/section/newmm.h"
|
||||
#include <cache/section/newmm.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
|
||||
|
|
|
@ -45,8 +45,8 @@
|
|||
/* INCLUDES *****************************************************************/
|
||||
|
||||
#include <ntoskrnl.h>
|
||||
#include "../cache/newcc.h"
|
||||
#include "../cache/section/newmm.h"
|
||||
#include <cache/newcc.h>
|
||||
#include <cache/section/newmm.h>
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
#include <reactos/exeformat.h>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
include(../ntos.cmake)
|
||||
|
||||
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl)
|
||||
spec2def(ntkrnlmp.exe ../ntoskrnl.spec)
|
||||
|
||||
if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <ntoskrnl.h>
|
||||
#ifdef NEWCC
|
||||
#include "../cache/newcc.h"
|
||||
#include <cache/newcc.h>
|
||||
#endif
|
||||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
|
|
Loading…
Reference in a new issue