From dfac71d0968872c1c404180b32ff8b8a2f9d2af6 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 11 Jul 2017 22:11:19 +0200 Subject: [PATCH] Revert "fix macro redifinitions" This reverts commit cbbf579f2178073b4d88c0bd2f2052e853a32a1e. --- ext/sodium/libsodium.c | 3 +-- ext/sodium/php_libsodium.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 10c23310bd..34bf7d4a2e 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -23,11 +23,10 @@ #include "php.h" #include "php_ini.h" #include "ext/standard/info.h" +#include "php_libsodium.h" #include "zend_exceptions.h" #include -#include "php_libsodium.h" - #include #define PHP_SODIUM_ZSTR_TRUNCATE(zs, len) do { ZSTR_LEN(zs) = (len); } while(0) diff --git a/ext/sodium/php_libsodium.h b/ext/sodium/php_libsodium.h index a24c3e4fa5..93d92e3e03 100644 --- a/ext/sodium/php_libsodium.h +++ b/ext/sodium/php_libsodium.h @@ -96,15 +96,9 @@ PHP_FUNCTION(sodium_add); PHP_FUNCTION(sodium_memcmp); PHP_FUNCTION(sodium_memzero); -#ifndef crypto_kx_BYTES #define crypto_kx_BYTES crypto_scalarmult_BYTES -#endif -#ifndef crypto_kx_PUBLICKEYBYTES #define crypto_kx_PUBLICKEYBYTES crypto_scalarmult_SCALARBYTES -#endif -#ifndef crypto_kx_SECRETKEYBYTES #define crypto_kx_SECRETKEYBYTES crypto_scalarmult_SCALARBYTES -#endif #endif /* PHP_LIBSODIUM_H */ -- 2.50.1