From 473e5df89b35dc376d50f3e53acb1df7ba93c853 Mon Sep 17 00:00:00 2001 From: weidai Date: Thu, 10 Jul 2003 04:34:23 +0000 Subject: merge in 5.0.4 changes (exclude DES and SHA-2 from DLL), attempt (failed) to build DLL with GCC --- dll.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'dll.h') diff --git a/dll.h b/dll.h index a8b07d69..e2554be7 100644 --- a/dll.h +++ b/dll.h @@ -1,7 +1,7 @@ #ifndef CRYPTOPP_DLL_H #define CRYPTOPP_DLL_H -#if !defined(CRYPTOPP_EXPORTS) && !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_NO_DLL) +#if !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS) && !defined(CRYPTOPP_NO_DLL) #ifdef CRYPTOPP_CONFIG_H #error To use the DLL version of Crypto++, this file must be included before any other Crypto++ header files. #endif @@ -47,14 +47,18 @@ #endif // #ifdef CRYPTOPP_IMPORTS -#include // for _PNH +#include // for new_handler NAMESPACE_BEGIN(CryptoPP) +#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) +using std::new_handler; +#endif + typedef void * (_cdecl * PNew)(size_t); typedef void (_cdecl * PDelete)(void *); typedef void (_cdecl * PGetNewAndDelete)(PNew &, PDelete &); -typedef _PNH (_cdecl * PSetNewHandler)(_PNH); +typedef new_handler (_cdecl * PSetNewHandler)(new_handler); typedef void (_cdecl * PSetNewAndDelete)(PNew, PDelete, PSetNewHandler); CRYPTOPP_DLL void DoDllPowerUpSelfTest(); -- cgit v1.2.1