com php-src: Revert "fix macro redifinitions": ext/sodium/libsodium.c ext/sodium/php_libsodium.h

Commit: dfac71d0968872c1c404180b32ff8b8a2f9d2af6 Author: Frank Denis <jedisct1@php.net> Tue, 11 Jul 2017 22:11:19 +0200 Committer: Joe Watkins <krakjoe@php.net> Wed, 12 Jul 2017 08:25:35 +0100 Parents: 2b7d3fb45f1878291ac13fc581fd504b1e5eaaa5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dfac71d0968872c1c404180b32ff8b8a2f9d2af6 Log: Revert "fix macro redifinitions" This reverts commit cbbf579f2178073b4d88c0bd2f2052e853a32a1e. Changed paths: M ext/sodium/libsodium.c M ext/sodium/php_libsodium.h Diff: diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium..c index 10c2331..34bf7d4 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 <sodium.h> -#include "php_libsodium.h" - #include <stdint.h> #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 a24c3e4..93d92e3 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 */