fix for Unix

pull/2/head
weidai 2003-07-11 19:48:49 +00:00
parent cadf4f866a
commit e43a0491cd
3 changed files with 5 additions and 5 deletions

View File

@ -264,7 +264,7 @@ NAMESPACE_END
#endif
#define CRYPTOPP_API __stdcall
#define CRYPTOPP_CDECL _cdecl
#define CRYPTOPP_CDECL __cdecl
#else // CRYPTOPP_WIN32_AVAILABLE

View File

@ -55,7 +55,7 @@ using std::set_new_handler;
static PNew s_pNew = NULL;
static PDelete s_pDelete = NULL;
static void * _cdecl New (size_t size)
static void * CRYPTOPP_CDECL New (size_t size)
{
new_handler newHandler = set_new_handler(NULL);
if (newHandler)
@ -124,7 +124,7 @@ static void SetNewAndDeleteFunctionPointers()
throw 0;
}
void * _cdecl operator new (size_t size)
void * CRYPTOPP_CDECL operator new (size_t size)
{
if (!s_pNew)
SetNewAndDeleteFunctionPointers();
@ -132,7 +132,7 @@ void * _cdecl operator new (size_t size)
return s_pNew(size);
}
void _cdecl operator delete (void * p)
void CRYPTOPP_CDECL operator delete (void * p)
{
s_pDelete(p);
}

View File

@ -144,7 +144,7 @@ unsigned int FileStore::CopyRangeTo2(BufferedTransformation &target, unsigned lo
unsigned long FileStore::Skip(unsigned long skipMax)
{
unsigned long oldPos = m_stream->tellg();
m_stream->seekg(skipMax, ios_base::cur);
m_stream->seekg(skipMax, ios::cur);
return (unsigned long)m_stream->tellg() - oldPos;
}