mirror of
https://github.com/reactos/reactos.git
synced 2025-01-05 22:12:46 +00:00
[DDK/PSDK]
Put NOP_FUNCTION where it belongs! svn path=/trunk/; revision=56135
This commit is contained in:
parent
a79c6b0ff0
commit
c59095903a
3 changed files with 16 additions and 10 deletions
|
@ -128,16 +128,6 @@ extern "C" {
|
||||||
#define ALLOC_DATA_PRAGMA 1
|
#define ALLOC_DATA_PRAGMA 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Add NOP_FUNCTION support */
|
|
||||||
#ifndef NOP_FUNCTION && (_MSC_VER >= 1210)
|
|
||||||
#define NOP_FUNCTION __noop
|
|
||||||
#else
|
|
||||||
#define NOP_FUNCTION (void)0
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#ifndef NOP_FUNCTION
|
|
||||||
#define NOP_FUNCTION (void)0
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_WIN64)
|
#if defined(_WIN64)
|
||||||
|
|
|
@ -237,6 +237,14 @@
|
||||||
#endif
|
#endif
|
||||||
#endif /* DECLSPEC_ADDRSAFE */
|
#endif /* DECLSPEC_ADDRSAFE */
|
||||||
|
|
||||||
|
#ifndef NOP_FUNCTION
|
||||||
|
#if (_MSC_VER >= 1210)
|
||||||
|
#define NOP_FUNCTION __noop
|
||||||
|
#else
|
||||||
|
#define NOP_FUNCTION (void)0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(_NTSYSTEM_)
|
#if !defined(_NTSYSTEM_)
|
||||||
#define NTSYSAPI DECLSPEC_IMPORT
|
#define NTSYSAPI DECLSPEC_IMPORT
|
||||||
#define NTSYSCALLAPI DECLSPEC_IMPORT
|
#define NTSYSCALLAPI DECLSPEC_IMPORT
|
||||||
|
|
|
@ -81,6 +81,14 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef NOP_FUNCTION
|
||||||
|
#if (_MSC_VER >= 1210)
|
||||||
|
#define NOP_FUNCTION __noop
|
||||||
|
#else
|
||||||
|
#define NOP_FUNCTION (void)0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
# define DECLSPEC_HIDDEN
|
# define DECLSPEC_HIDDEN
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
Loading…
Reference in a new issue