From b9b66faddbe32b8cbe4f91a75bae6e48988c0715 Mon Sep 17 00:00:00 2001 From: infinitydev Date: Fri, 9 Jul 2021 13:38:07 +0000 Subject: [PATCH] Fix build on z/OS using XLC (#1089) * Fix incorrect XLC #pragma in public header * Fix incorrect XLC #pragma in internal blake2 header --- src/libsodium/crypto_generichash/blake2b/ref/blake2.h | 2 +- src/libsodium/include/sodium/crypto_generichash_blake2b.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsodium/crypto_generichash/blake2b/ref/blake2.h b/src/libsodium/crypto_generichash/blake2b/ref/blake2.h index ae93c1aa..50f664dd 100644 --- a/src/libsodium/crypto_generichash/blake2b/ref/blake2.h +++ b/src/libsodium/crypto_generichash/blake2b/ref/blake2.h @@ -61,7 +61,7 @@ typedef struct blake2b_state { uint8_t last_node; } blake2b_state; -#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) #pragma pack() #else #pragma pack(pop) diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h index fee9d8ad..1f322074 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -24,7 +24,7 @@ typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state { unsigned char opaque[384]; } crypto_generichash_blake2b_state; -#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) # pragma pack() #else # pragma pack(pop)