From 0468e778d229054a966d0fdc629ec8b677bc37c6 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 15 Jan 2018 13:34:31 +0100 Subject: [PATCH] Revert "Solaris Studio apparently supports __attribute__()" This reverts commit 74a4496cc5931cd5a72486768a84a40a19491cc4. --- src/libsodium/include/sodium/export.h | 2 +- src/libsodium/include/sodium/private/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsodium/include/sodium/export.h b/src/libsodium/include/sodium/export.h index f6aa242d..b786c77b 100644 --- a/src/libsodium/include/sodium/export.h +++ b/src/libsodium/include/sodium/export.h @@ -2,7 +2,7 @@ #ifndef sodium_export_H #define sodium_export_H -#if !defined(__clang__) && !defined(__GNUC__) && !defined(__SUNPRO_C) +#if !defined(__clang__) && !defined(__GNUC__) # ifdef __attribute__ # undef __attribute__ # endif diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h index 4863cc65..632fc8a7 100644 --- a/src/libsodium/include/sodium/private/common.h +++ b/src/libsodium/include/sodium/private/common.h @@ -196,7 +196,7 @@ xor_buf(unsigned char *out, const unsigned char *in, size_t n) } } -#if !defined(__clang__) && !defined(__GNUC__) && !defined(__SUNPRO_C) +#if !defined(__clang__) && !defined(__GNUC__) # ifdef __attribute__ # undef __attribute__ # endif