diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
| commit | d9e11d0c51182483d30760f3c66000a0e9b8c922 (patch) | |
| tree | e1d147b2d9d270f8cec60e499bc5fd738144d4c2 /misc | |
| parent | d5ce2d1c5dfae01688cad679b2fbd071e70a1f3a (diff) | |
| parent | 9a079e270a9bec7e1fe28aeda63e07c1bb808d44 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
sysdeps/mach/hurd/i386/init-first.c
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/sys/cdefs.h | 14 | ||||
| -rw-r--r-- | misc/sys/param.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index f5f18e914c..4aded9bbbd 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -318,10 +318,12 @@ # define __attribute_artificial__ /* Ignore */ #endif -/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 - inline semantics, unless -fgnu89-inline is used. */ -#if (!defined __cplusplus || __GNUC_PREREQ (4,3)) && defined __GNUC__ -# if defined __GNUC_STDC_INLINE__ || defined __cplusplus +#ifdef __GNUC__ +/* One of these will be defined if the __gnu_inline__ attribute is + available. In C++, __GNUC_GNU_INLINE__ will be defined even though + __inline does not use the GNU inlining rules. If neither macro is + defined, this version of GCC only supports GNU inline semantics. */ +# if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ # define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__)) @@ -329,10 +331,6 @@ # define __extern_inline extern __inline # define __extern_always_inline extern __always_inline # endif -#elif defined __GNUC__ /* C++ and GCC <4.3. */ -# define __extern_inline extern __inline -# define __extern_always_inline \ - extern __always_inline #else /* Not GCC. */ # define __extern_inline /* Ignore */ # define __extern_always_inline /* Ignore */ diff --git a/misc/sys/param.h b/misc/sys/param.h index 5e6353d1e8..d257ec7576 100644 --- a/misc/sys/param.h +++ b/misc/sys/param.h @@ -71,7 +71,9 @@ /* Unit of `st_blocks'. */ -#define DEV_BSIZE 512 +#ifndef DEV_BSIZE +# define DEV_BSIZE 512 +#endif /* Bit map related macros. */ |