1 files changed, 11 insertions, 20 deletions
diff --git a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2.h b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2.h
index b027a5b834..55ddec64f0 100644
--- a/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2.h
+++ b/libs/libsodium/src/crypto_generichash/blake2b/ref/blake2.h
@@ -22,20 +22,7 @@
 
 #include "crypto_generichash_blake2b.h"
 #include "export.h"
-
-#define blake2b_init_param crypto_generichash_blake2b__init_param
-#define blake2b_init crypto_generichash_blake2b__init
-#define blake2b_init_salt_personal \
-    crypto_generichash_blake2b__init_salt_personal
-#define blake2b_init_key crypto_generichash_blake2b__init_key
-#define blake2b_init_key_salt_personal \
-    crypto_generichash_blake2b__init_key_salt_personal
-#define blake2b_update crypto_generichash_blake2b__update
-#define blake2b_final crypto_generichash_blake2b__final
-#define blake2b crypto_generichash_blake2b__blake2b
-#define blake2b_salt_personal crypto_generichash_blake2b__blake2b_salt_personal
-#define blake2b_pick_best_implementation \
-    crypto_generichash_blake2b__pick_best_implementation
+#include "private/quirks.h"
 
 enum blake2b_constant {
     BLAKE2B_BLOCKBYTES    = 128,
@@ -45,10 +32,12 @@ enum blake2b_constant {
     BLAKE2B_PERSONALBYTES = 16
 };
 
-#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma pack(1)
+#ifdef __IBMC__
+# pragma pack(1)
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# pragma pack(1)
 #else
-#pragma pack(push, 1)
+# pragma pack(push, 1)
 #endif
 
 typedef struct blake2b_param_ {
@@ -74,10 +63,12 @@ typedef struct blake2b_state {
     uint8_t  last_node;
 } blake2b_state;
 
-#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma pack()
+#ifdef __IBMC__
+# pragma pack(pop)
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# pragma pack()
 #else
-#pragma pack(pop)
+# pragma pack(pop)
 #endif
 
 /* Streaming API */