From 82b41835c56ed321e48d17379342a56bea2bbf63 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 23 Nov 2015 17:06:33 +0100 Subject: [PATCH] Support the IBM compiler --- src/libsodium/crypto_generichash/blake2/ref/blake2.h | 4 ++-- src/libsodium/include/sodium/crypto_generichash_blake2b.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2.h b/src/libsodium/crypto_generichash/blake2/ref/blake2.h index 482919b2..3f53fd03 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2.h +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2.h @@ -53,7 +53,7 @@ extern "C" { BLAKE2B_PERSONALBYTES = 16 }; -#ifdef __SUNPRO_C +#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) # pragma pack(1) #else # pragma pack(push, 1) @@ -129,7 +129,7 @@ CRYPTO_ALIGN( 64 ) typedef struct blake2b_state_ size_t buflen; } blake2bp_state; -#ifdef __SUNPRO_C +#if defined(__IBMC__) || 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 6adbce58..1708813e 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -14,7 +14,7 @@ extern "C" { #endif -#ifdef __SUNPRO_C +#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) # pragma pack(1) #else # pragma pack(push, 1) @@ -29,7 +29,7 @@ typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state { uint8_t last_node; } crypto_generichash_blake2b_state; -#ifdef __SUNPRO_C +#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) # pragma pack() #else # pragma pack(pop)