Fix macro name from wrong branch

This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-15 11:03:43 +02:00
parent e6c8366b46
commit a1e32415d5
2 changed files with 6 additions and 9 deletions

View File

@ -23,15 +23,12 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#if ! defined(MBEDTLS_DEPRECATED_REMOVED) #if ! defined(POLARSSL_DEPRECATED_REMOVED)
#if defined(MBEDTLS_DEPRECATED_WARNING) #if defined(POLARSSL_DEPRECATED_WARNING)
#warning "Including compat-1.2.h is deprecated" #warning "Including compat-1.2.h is deprecated"
#endif #endif
#ifndef MBEDTLS_COMPAT13_H
#define MBEDTLS_COMPAT13_H
#ifndef POLARSSL_COMPAT_1_2_H #ifndef POLARSSL_COMPAT_1_2_H
#define POLARSSL_COMPAT_1_2_H #define POLARSSL_COMPAT_1_2_H
@ -395,4 +392,4 @@ static inline int x509_write_key_der( unsigned char *buf, size_t len, rsa_contex
} }
#endif /* POLARSSL_PK_WRITE_C && POLARSSL_RSA_C */ #endif /* POLARSSL_PK_WRITE_C && POLARSSL_RSA_C */
#endif /* compat-1.2.h */ #endif /* compat-1.2.h */
#endif /* MBEDTLS_DEPRECATED_REMOVED */ #endif /* POLARSSL_DEPRECATED_REMOVED */

View File

@ -28,9 +28,9 @@
* OpenSSL wrapper contributed by David Barett * OpenSSL wrapper contributed by David Barett
*/ */
#if ! defined(MBEDTLS_DEPRECATED_REMOVED) #if ! defined(POLARSSL_DEPRECATED_REMOVED)
#if defined(MBEDTLS_DEPRECATED_WARNING) #if defined(POLARSSL_DEPRECATED_WARNING)
#warning "Including openssl.h is deprecated" #warning "Including openssl.h is deprecated"
#endif #endif
@ -145,4 +145,4 @@ inline int RSA_private_encrypt( int size, unsigned char* input, unsigned char* o
#endif #endif
#endif /* openssl.h */ #endif /* openssl.h */
#endif /* MBEDTLS_DEPRECATED_REMOVED */ #endif /* POLARSSL_DEPRECATED_REMOVED */