Differential D4709 Diff 11849 databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
- This file was moved from databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc.
| --- storage/tokudb/ft-index/portability/memory.cc.orig 2015-06-17 14:54:13 UTC | --- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC | ||||
| +++ storage/tokudb/ft-index/portability/memory.cc | +++ storage/tokudb/PerconaFT/portability/memory.cc | ||||
| @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: | @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: | ||||
| #include <string.h> | #include <string.h> | ||||
| #include <stdio.h> | #include <stdio.h> | ||||
| #include <stdlib.h> | #include <stdlib.h> | ||||
| -#if defined(HAVE_MALLOC_H) | -#if defined(HAVE_MALLOC_H) | ||||
| -# include <malloc.h> | -# include <malloc.h> | ||||
| -#elif defined(HAVE_SYS_MALLOC_H) | -#elif defined(HAVE_SYS_MALLOC_H) | ||||
| -# include <sys/malloc.h> | -# include <sys/malloc.h> | ||||
| -#endif | -#endif | ||||
| #include <dlfcn.h> | #include <dlfcn.h> | ||||
| #include <toku_race_tools.h> | #include <toku_race_tools.h> | ||||
| #include "memory.h" | #include "memory.h" | ||||