From 3ed526868f6dfd1c3b58711e452b85908504ffe8 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Mon, 13 Oct 2014 10:53:58 +0000 Subject: [PATCH] [PSDK] and [NDK] - Since NTSTATUS definition is returned into bcrypt.h, then let's define PNTSTATUS too. Otherwise it makes no sense and errors out. - Handle BCRYPT_H and __WINE_BCRYPT_H in ndk/umtypes.h. Thomas said that BCRYPT_H is not an option - but our NDK should be compatible with ReactOS PSDK too. If I am wrong, please feel free to change __WINE_BCRYPT_H to BCRYPT_H in psdk/bcrypt.h, fix related probelms and revert my change. Thanks! svn path=/trunk/; revision=64713 --- reactos/include/ndk/umtypes.h | 2 +- reactos/include/psdk/bcrypt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index a97580c6b83..39c70cca936 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -129,7 +129,7 @@ typedef LONG KPRIORITY; // #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) -#ifndef __BCRYPT_H__ +#if !defined(__BCRYPT_H__) && !defined(__WINE_BCRYPT_H) typedef _Return_type_success_(return >= 0) long NTSTATUS, *PNTSTATUS; #endif diff --git a/reactos/include/psdk/bcrypt.h b/reactos/include/psdk/bcrypt.h index 629418a1097..c3837a45c81 100644 --- a/reactos/include/psdk/bcrypt.h +++ b/reactos/include/psdk/bcrypt.h @@ -37,6 +37,7 @@ #ifndef _NTDEF_ typedef _Return_type_success_(return >= 0) LONG NTSTATUS; +typedef NTSTATUS *PNTSTATUS; #endif typedef struct _BCRYPT_ALGORITHM_IDENTIFIER