diff --git a/include/mbedtls/memory.h b/include/mbedtls/memory.h deleted file mode 100644 index 9b2daef37..000000000 --- a/include/mbedtls/memory.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * \file memory.h - * - * \brief Memory allocation layer (Deprecated to platform layer) - * - * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved - * - * This file is part of mbed TLS (https://tls.mbed.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef POLARSSL_MEMORY_H -#define POLARSSL_MEMORY_H - -#if !defined(POLARSSL_CONFIG_FILE) -#include "config.h" -#else -#include POLARSSL_CONFIG_FILE -#endif - -#include - -#include "platform.h" -#include "memory_buffer_alloc.h" - -int memory_set_own( void * (*malloc_func)( size_t ), - void (*free_func)( void * ) ) -{ - return platform_set_malloc_free( malloc_func, free_func ); -} - - -#endif /* memory.h */ diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 907f108e7..56390db50 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -176,7 +176,6 @@ - diff --git a/visualc/VS6/mbedtls.dsp b/visualc/VS6/mbedtls.dsp index 59108ec84..3591b3419 100644 --- a/visualc/VS6/mbedtls.dsp +++ b/visualc/VS6/mbedtls.dsp @@ -501,10 +501,6 @@ SOURCE=..\..\include\mbedtls\md_wrap.h # End Source File # Begin Source File -SOURCE=..\..\include\mbedtls\memory.h -# End Source File -# Begin Source File - SOURCE=..\..\include\mbedtls\memory_buffer_alloc.h # End Source File # Begin Source File