mirror of
https://github.com/MariaDB/server.git
synced 2026-04-26 10:15:29 +02:00
Fixed windows compilation problems
extra/yassl/taocrypt/mySTL/algorithm.hpp: max is defined on windows sql/sql_list.h: Fixed compiler warning on windows
This commit is contained in:
parent
338cb6a836
commit
3c9904123b
2 changed files with 4 additions and 0 deletions
|
|
@ -38,6 +38,8 @@ public:
|
|||
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
|
||||
static void operator delete(void *ptr, MEM_ROOT *mem_root)
|
||||
{ /* never called */ }
|
||||
static void operator delete[](void *ptr, MEM_ROOT *mem_root)
|
||||
{ /* never called */ }
|
||||
static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
|
||||
#ifdef HAVE_purify
|
||||
bool dummy;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue