From: Anatol Belski <ab@php.net>
Date: Tue, 11 Jul 2017 08:01:37 +0000 (+0200)
Subject: fix macro redifinitions
X-Git-Tag: php-7.2.0beta1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbbf579f2178073b4d88c0bd2f2052e853a32a1e;p=php

fix macro redifinitions
---

diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index 34bf7d4a2e..10c23310bd 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -23,10 +23,11 @@
 #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 93d92e3e03..a24c3e4fa5 100644
--- a/ext/sodium/php_libsodium.h
+++ b/ext/sodium/php_libsodium.h
@@ -96,9 +96,15 @@ 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 */