From a72aa856bdcc23dab64af83757830e1d2e1618c8 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 25 Jul 2010 14:44:29 +0000 Subject: Move some gcc extensions to new gcc_extensions.h header - Move ATTRIBUTE_PRINTF/ATTRIBUTE_SCANF from _ansi.h They are not related at all to this file, and this broke compilation with Code Sourcery GCC which ships its own _ansi.h - Move LIKELY/UNLIKELY from system.h There is likely a lot more GCC extensions used everywhere in the source, conditionally on __GNUC__ or unconditionally git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27548 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/debug.h | 2 +- firmware/export/logf.h | 2 +- firmware/export/panic.h | 2 +- firmware/export/system.h | 10 +--------- 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/debug.h b/firmware/export/debug.h index 9d85590136..f7f0f32426 100644 --- a/firmware/export/debug.h +++ b/firmware/export/debug.h @@ -21,7 +21,7 @@ #ifndef DEBUG_H #define DEBUG_H -#include "../include/_ansi.h" +#include "gcc_extensions.h" extern void debug_init(void); extern void debugf(const char* fmt,...) ATTRIBUTE_PRINTF(1, 2); diff --git a/firmware/export/logf.h b/firmware/export/logf.h index 1aca29d5ba..b57ae91872 100644 --- a/firmware/export/logf.h +++ b/firmware/export/logf.h @@ -22,7 +22,7 @@ #define LOGF_H #include #include -#include "../include/_ansi.h" +#include "gcc_extensions.h" #include "debug.h" #ifdef ROCKBOX_HAS_LOGF diff --git a/firmware/export/panic.h b/firmware/export/panic.h index 0808f3b300..b0325aaeb7 100644 --- a/firmware/export/panic.h +++ b/firmware/export/panic.h @@ -22,7 +22,7 @@ #ifndef __PANIC_H__ #define __PANIC_H__ -#include "_ansi.h" +#include "gcc_extensions.h" void panicf( const char *fmt, ... ) ATTRIBUTE_PRINTF(1, 2); diff --git a/firmware/export/system.h b/firmware/export/system.h index bbaf5d74df..ce6277ac7a 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -25,6 +25,7 @@ #include "cpu.h" #include "stdbool.h" #include "kernel.h" +#include "gcc_extensions.h" /* for LIKELY/UNLIKELY */ extern void system_reboot (void); /* Called from any UIE handler and panicf - wait for a key and return @@ -198,15 +199,6 @@ int get_cpu_boost_counter(void); #define TYPE_FROM_MEMBER(type, memberptr, membername) \ ((type *)((intptr_t)(memberptr) - OFFSETOF(type, membername))) -/* Use to give gcc hints on which branch is most likely taken */ -#if defined(__GNUC__) && __GNUC__ >= 3 -#define LIKELY(x) __builtin_expect(!!(x), 1) -#define UNLIKELY(x) __builtin_expect(!!(x), 0) -#else -#define LIKELY(x) (x) -#define UNLIKELY(x) (x) -#endif - /* returns index of first set bit or 32 if no bits are set */ int find_first_set_bit(uint32_t val); -- cgit v1.2.3