From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 75498 invoked by alias); 17 Aug 2017 12:11:55 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 74990 invoked by uid 9242); 17 Aug 2017 12:11:54 -0000 Date: Thu, 17 Aug 2017 12:11:00 -0000 Message-ID: <20170817121154.74988.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Eric Blake To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] headers: avoid bareword attributes X-Act-Checkin: newlib-cygwin X-Git-Author: Eric Blake X-Git-Refname: refs/heads/master X-Git-Oldrev: 7b3d8b9485186aa17db10c76f347e3e12201a12c X-Git-Newrev: 979d467ff6e39ee5c52cf1aac7a6c9c63058141c X-SW-Source: 2017-q3/txt/msg00044.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=979d467ff6e39ee5c52cf1aac7a6c9c63058141c commit 979d467ff6e39ee5c52cf1aac7a6c9c63058141c Author: Eric Blake Date: Wed Aug 16 20:39:18 2017 -0500 headers: avoid bareword attributes Always use the __-decorated form of an attribute name in public headers, as the bareword form is in the user's namespace, and we don't want compilation to break just because the user defines the bareword to mean something else. Signed-off-by: Eric Blake Diff: --- newlib/libc/include/sys/cdefs.h | 28 ++++++++++++++-------------- newlib/libc/sys/phoenix/sys/unistd.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h index 2e63a07..9e58ee9 100644 --- a/newlib/libc/include/sys/cdefs.h +++ b/newlib/libc/include/sys/cdefs.h @@ -681,42 +681,42 @@ #endif /* Structure implements a lock. */ -#define __lockable __lock_annotate(lockable) +#define __lockable __lock_annotate(__lockable__) /* Function acquires an exclusive or shared lock. */ #define __locks_exclusive(...) \ - __lock_annotate(exclusive_lock_function(__VA_ARGS__)) + __lock_annotate(__exclusive_lock_function__(__VA_ARGS__)) #define __locks_shared(...) \ - __lock_annotate(shared_lock_function(__VA_ARGS__)) + __lock_annotate(__shared_lock_function__(__VA_ARGS__)) /* Function attempts to acquire an exclusive or shared lock. */ #define __trylocks_exclusive(...) \ - __lock_annotate(exclusive_trylock_function(__VA_ARGS__)) + __lock_annotate(__exclusive_trylock_function__(__VA_ARGS__)) #define __trylocks_shared(...) \ - __lock_annotate(shared_trylock_function(__VA_ARGS__)) + __lock_annotate(__shared_trylock_function__(__VA_ARGS__)) /* Function releases a lock. */ -#define __unlocks(...) __lock_annotate(unlock_function(__VA_ARGS__)) +#define __unlocks(...) __lock_annotate(__unlock_function__(__VA_ARGS__)) /* Function asserts that an exclusive or shared lock is held. */ #define __asserts_exclusive(...) \ - __lock_annotate(assert_exclusive_lock(__VA_ARGS__)) + __lock_annotate(__assert_exclusive_lock__(__VA_ARGS__)) #define __asserts_shared(...) \ - __lock_annotate(assert_shared_lock(__VA_ARGS__)) + __lock_annotate(__assert_shared_lock__(__VA_ARGS__)) /* Function requires that an exclusive or shared lock is or is not held. */ #define __requires_exclusive(...) \ - __lock_annotate(exclusive_locks_required(__VA_ARGS__)) + __lock_annotate(__exclusive_locks_required__(__VA_ARGS__)) #define __requires_shared(...) \ - __lock_annotate(shared_locks_required(__VA_ARGS__)) + __lock_annotate(__shared_locks_required__(__VA_ARGS__)) #define __requires_unlocked(...) \ - __lock_annotate(locks_excluded(__VA_ARGS__)) + __lock_annotate(__locks_excluded__(__VA_ARGS__)) /* Function should not be analyzed. */ -#define __no_lock_analysis __lock_annotate(no_thread_safety_analysis) +#define __no_lock_analysis __lock_annotate(__no_thread_safety_analysis__) /* Guard variables and structure members by lock. */ -#define __guarded_by(x) __lock_annotate(guarded_by(x)) -#define __pt_guarded_by(x) __lock_annotate(pt_guarded_by(x)) +#define __guarded_by(x) __lock_annotate(__guarded_by__(x)) +#define __pt_guarded_by(x) __lock_annotate(__pt_guarded_by__(x)) #endif /* !_SYS_CDEFS_H_ */ diff --git a/newlib/libc/sys/phoenix/sys/unistd.h b/newlib/libc/sys/phoenix/sys/unistd.h index bdf5bd5..77b96dd 100644 --- a/newlib/libc/sys/phoenix/sys/unistd.h +++ b/newlib/libc/sys/phoenix/sys/unistd.h @@ -35,7 +35,7 @@ extern char **environ; -void _exit(int status) _ATTRIBUTE ((noreturn)); +void _exit(int status) _ATTRIBUTE ((__noreturn__)); int access(const char *pathname, int mode); unsigned int alarm(unsigned seconds);