[ros-diffs] [tkreuzer] 39518: Rename ntddk.h include guard to _NTDDK_ as it's supposed to be. Remove a bunch of hack defines of _NTDDK_.
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Mon Feb 9 23:50:40 CET 2009
Author: tkreuzer
Date: Mon Feb 9 16:50:40 2009
New Revision: 39518
URL: http://svn.reactos.org/svn/reactos?rev=39518&view=rev
Log:
Rename ntddk.h include guard to _NTDDK_ as it's supposed to be. Remove a bunch of hack defines of _NTDDK_.
Modified:
trunk/reactos/drivers/ksfilter/ks/ks.rbuild
trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h
trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild
trunk/reactos/include/ddk/ntddk.h
trunk/reactos/include/psdk/ks.h
trunk/reactos/include/psdk/winnt.h
trunk/reactos/include/reactos/debug.h
Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbuild?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -8,7 +8,6 @@
<library>ntoskrnl</library>
<library>hal</library>
<define name="BUILDING_KS" />
- <define name="_NTDDK_" />
<define name="_COMDDK_" />
<file>ks.rc</file>
<file>allocators.c</file>
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd">
<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" entrypoint="0">
<importlibrary definition="portcls.spec" />
- <define name="_NTDDK_" />
<define name="PC_NO_IMPORTS" />
<include base="portcls">../include</include>
<library>ntoskrnl</library>
Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -1,7 +1,6 @@
#ifndef WDMAUD_H__
#define WDMAUD_H__
-#define _NTDDK_
#include <ntddk.h>
#include <portcls.h>
#define YDEBUG
Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -4,7 +4,6 @@
<include base="sysaudio">.</include>
<library>ntoskrnl</library>
<library>ks</library>
- <define name="_NTDDK_" />
<define name="_COMDDK_" />
<file>main.c</file>
<file>sysaudio.rc</file>
Modified: trunk/reactos/include/ddk/ntddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -24,8 +24,8 @@
* _X86_ - X86 environment
*/
-#ifndef __NTDDK_H
-#define __NTDDK_H
+#ifndef _NTDDK_
+#define _NTDDK_
//
// Dependencies
@@ -63,4 +63,4 @@
/* Definitions only in Windows NT 4 */
#include "winnt4.h"
-#endif /* __NTDDK_H */
+#endif /* _NTDDK_ */
Modified: trunk/reactos/include/psdk/ks.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -1056,7 +1056,7 @@
} KSCOMPLETION_INVOCATION;
-#if defined(__NTDDK_H)
+#if defined(_NTDDK_)
/* MOVE ME */
typedef NTSTATUS (*PFNKSCONTEXT_DISPATCH)(
IN PVOID Context,
@@ -1106,7 +1106,7 @@
Dispatch Table
http://www.osronline.com/DDKx/stream/ks-struct_494j.htm
*/
-#if defined(__NTDDK_H)
+#if defined(_NTDDK_)
typedef struct
{
PDRIVER_DISPATCH DeviceIoControl;
@@ -1323,7 +1323,7 @@
{
} KSOBJECT_CREATE, *PKSOBJECT_CREATE;
-#if defined(__NTDDK_H)
+#if defined(_NTDDK_)
typedef struct
{
PDRIVER_DISPATCH Create;
@@ -1581,7 +1581,7 @@
typedef PVOID (*PFNKSDELETEALLOCATOR)(
IN PVOID Context);
-#if defined(__NTDDK_H)
+#if defined(_NTDDK_)
typedef NTSTATUS (*PFNKSALLOCATOR)(
IN PIRP Irp,
IN ULONG BufferSize,
Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -465,7 +465,7 @@
#define FILE_NAMED_STREAMS 0x00040000
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define IO_COMPLETION_QUERY_STATE 0x0001
#define IO_COMPLETION_MODIFY_STATE 0x0002
#define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
@@ -480,7 +480,7 @@
#define MAILSLOT_NO_MESSAGE ((DWORD)-1)
#define MAILSLOT_WAIT_FOREVER ((DWORD)-1)
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define PROCESS_TERMINATE 1
#define PROCESS_CREATE_THREAD 2
#define PROCESS_SET_SESSIONID 4
@@ -502,7 +502,7 @@
#define THREAD_SET_CONTEXT 16
#define THREAD_SET_INFORMATION 32
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define THREAD_QUERY_INFORMATION 64
#define THREAD_SET_THREAD_TOKEN 128
#define THREAD_IMPERSONATE 256
@@ -510,7 +510,7 @@
#endif
#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF)
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define MUTANT_QUERY_STATE 0x0001
#define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE)
#define TIMER_QUERY_STATE 0x0001
@@ -739,7 +739,7 @@
#define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege")
#define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege")
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define SE_GROUP_MANDATORY 1
#define SE_GROUP_ENABLED_BY_DEFAULT 2
#define SE_GROUP_ENABLED 4
@@ -1257,7 +1257,7 @@
#define MEM_PHYSICAL 0x400000
#define MEM_4MB_PAGES 0x80000000
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define MEM_IMAGE SEC_IMAGE
#define SEC_NO_CHANGE 0x00400000
#define SEC_FILE 0x00800000
@@ -1274,7 +1274,7 @@
#define SECTION_MAP_EXECUTE 8
#define SECTION_ALL_ACCESS 0xf001f
#define WRITE_WATCH_FLAG_RESET 0x01
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define MESSAGE_RESOURCE_UNICODE 1
#endif
#define RTL_CRITSECT_TYPE 0
@@ -1900,7 +1900,7 @@
ACCESS_MASK GenericAll;
} GENERIC_MAPPING, *PGENERIC_MAPPING;
/* Sigh..when will they learn... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
typedef struct _ACE_HEADER {
BYTE AceType;
BYTE AceFlags;
@@ -2975,7 +2975,7 @@
SECURITY_IMPERSONATION_LEVEL Level;
} SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE;
/* Steven you are my hero when you fix the w32api ddk! */
-#if !defined(__NTDDK_H)
+#if !defined(_NTDDK_)
typedef struct _SID_IDENTIFIER_AUTHORITY {
BYTE Value[6];
} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY;
@@ -3175,7 +3175,7 @@
DWORD Size;
} TAPE_CREATE_PARTITION,*PTAPE_CREATE_PARTITION;
/* Sigh..when will they learn... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
typedef struct _MEMORY_BASIC_INFORMATION {
PVOID BaseAddress;
PVOID AllocationBase;
@@ -3267,7 +3267,7 @@
);
/* FIXME: Please oh please stop including winnt.h from the DDK... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
typedef struct _RTL_CRITICAL_SECTION_DEBUG {
WORD Type;
WORD CreatorBackTraceIndex;
@@ -4124,7 +4124,7 @@
#define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#define JOB_OBJECT_ASSIGN_PROCESS 1
#define JOB_OBJECT_SET_ATTRIBUTES 2
#define JOB_OBJECT_QUERY 4
@@ -4184,7 +4184,7 @@
DWORD UIRestrictionsClass;
} JOBOBJECT_BASIC_UI_RESTRICTIONS,*PJOBOBJECT_BASIC_UI_RESTRICTIONS;
/* Steven you are my hero when you fix the w32api ddk! */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION {
DWORD SecurityLimitFlags;
HANDLE JobToken;
@@ -4383,7 +4383,7 @@
ULONG DefaultAlert2;
} SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE;
-#ifndef __NTDDK_H /* HACK!!! ntddk.h shouldn't include winnt.h! */
+#ifndef _NTDDK_ /* HACK!!! ntddk.h shouldn't include winnt.h! */
typedef struct _PROCESSOR_POWER_INFORMATION {
ULONG Number;
ULONG MaxMhz;
@@ -4727,7 +4727,7 @@
#endif
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
-#ifndef __NTDDK_H
+#ifndef _NTDDK_
#ifdef _M_IX86
static __inline__ struct _TEB * NtCurrentTeb(void)
{
Modified: trunk/reactos/include/reactos/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?rev=39518&r1=39517&r2=39518&view=diff
==============================================================================
--- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Mon Feb 9 16:50:40 2009
@@ -17,7 +17,7 @@
#define __INTERNAL_DEBUG
/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
-#if !defined(_RTLFUNCS_H) && (!defined(_NTDDK_) || !defined(__NTDDK_H))
+#if !defined(_RTLFUNCS_H) && !defined(_NTDDK_)
/* Make sure we have basic types (some people include us *before* SDK... */
#if !defined(_NTDEF_) && !defined(_NTDEF_H) && !defined(_WINDEF_) && !defined(_WINDEF_H)
More information about the Ros-diffs
mailing list