[Libreoffice-commits] core.git: include/sal

[Noel Grandin]

 include/sal/types.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b36120b8e1991bd4939b7d4838a4f0333c8a3016
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue May 30 09:28:22 2017 +0200

    and fix my previous commit
    
    Change-Id: I63a22d5cf7a45d7b6fb3d1b356aa98ff954449e5

diff --git a/include/sal/types.h b/include/sal/types.h
index 053e53d87b8d..9d5f699c9794 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -697,13 +697,11 @@ inline char16_t const * SAL_U(wchar_t const * p)
 
     @since LibreOffice 5.5
 */
-#if defined LIBO_INTERNAL_ONLY
-#if (defined __GNUC__ && __GNUC__ > 4) || defined __clang__
+#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && __GNUC__ > 4) || defined __clang__)
 #define SAL_RETURNS_NONNULL  __attribute__((returns_nonnull))
 #else
 #define SAL_RETURNS_NONNULL
 #endif
-#endif
 /// @endcond
 
 #endif // INCLUDED_SAL_TYPES_H