mirror of
https://github.com/reactos/reactos.git
synced 2025-04-20 04:20:46 +00:00
[RTL]
* Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716 svn path=/trunk/; revision=61526
This commit is contained in:
parent
28e70c447d
commit
4c8f3361d9
5 changed files with 7 additions and 15 deletions
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
/* Based on Wine 1.1.26 */
|
/* Based on Wine 1.1.26 */
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
|
||||||
#include <rtl.h>
|
#include <rtl.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
|
|
||||||
#include <rtl.h>
|
#include <rtl.h>
|
||||||
|
|
||||||
|
#include <ndk/kdfuncs.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
|
|
||||||
/* INCLUDES *******************************************************************/
|
/* INCLUDES *******************************************************************/
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define CONST_VTABLE
|
|
||||||
|
|
||||||
#include <rtl.h>
|
#include <rtl.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
|
|
|
@ -10,6 +10,9 @@
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <rtl.h>
|
#include <rtl.h>
|
||||||
|
|
||||||
|
#include <ndk/cmfuncs.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
* PROGRAMMER: Alex Ionescu
|
* PROGRAMMER: Alex Ionescu
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
|
||||||
|
|
||||||
#ifndef RTL_H
|
#ifndef RTL_H
|
||||||
#define RTL_H
|
#define RTL_H
|
||||||
|
|
||||||
|
@ -23,14 +21,14 @@
|
||||||
#define WIN32_NO_STATUS
|
#define WIN32_NO_STATUS
|
||||||
#define _INC_WINDOWS
|
#define _INC_WINDOWS
|
||||||
#define COM_NO_WINDOWS_H
|
#define COM_NO_WINDOWS_H
|
||||||
|
#define COBJMACROS
|
||||||
|
#define CONST_VTABLE
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
#include <winbase.h>
|
#include <winbase.h>
|
||||||
#include <winreg.h>
|
#include <winreg.h>
|
||||||
#include <objbase.h>
|
#include <objbase.h>
|
||||||
#include <ndk/cmfuncs.h>
|
|
||||||
#include <ndk/exfuncs.h>
|
#include <ndk/exfuncs.h>
|
||||||
#include <ndk/iofuncs.h>
|
#include <ndk/iofuncs.h>
|
||||||
#include <ndk/kdfuncs.h>
|
|
||||||
#include <ndk/kefuncs.h>
|
#include <ndk/kefuncs.h>
|
||||||
#include <ndk/ldrfuncs.h>
|
#include <ndk/ldrfuncs.h>
|
||||||
#include <ndk/mmfuncs.h>
|
#include <ndk/mmfuncs.h>
|
||||||
|
@ -44,11 +42,6 @@
|
||||||
/* Internal RTL header */
|
/* Internal RTL header */
|
||||||
#include "rtlp.h"
|
#include "rtlp.h"
|
||||||
|
|
||||||
/* PSEH Support */
|
|
||||||
#include <pseh/pseh2.h>
|
|
||||||
|
|
||||||
#include <intrin.h>
|
|
||||||
|
|
||||||
/* Use intrinsics for x86 and x64 */
|
/* Use intrinsics for x86 and x64 */
|
||||||
#if defined(_M_IX86) || defined(_M_AMD64)
|
#if defined(_M_IX86) || defined(_M_AMD64)
|
||||||
#define InterlockedCompareExchange _InterlockedCompareExchange
|
#define InterlockedCompareExchange _InterlockedCompareExchange
|
||||||
|
@ -61,5 +54,3 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* RTL_H */
|
#endif /* RTL_H */
|
||||||
|
|
||||||
/* EOF */
|
|
||||||
|
|
Loading…
Reference in a new issue