Address regressions from e8ff555b95
and d206d52f65
to work with other compilers
1) The error attribute appeared in gcc-4.3 2) The return type of __builtin_constant_p is int 3) Sun Studio 12.0 and later builtin support for __builtin_constant_p Found by Tinderbox. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
parent
afb1fe695d
commit
206b30ebc6
|
@ -261,14 +261,16 @@ version_compare(uint16_t a_major, uint16_t a_minor,
|
||||||
#define SwapRestL(stuff) \
|
#define SwapRestL(stuff) \
|
||||||
SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))
|
SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
|
||||||
void __attribute__((error("wrong sized variable passed to swap"))) wrong_size(void);
|
void __attribute__((error("wrong sized variable passed to swap"))) wrong_size(void);
|
||||||
#else
|
#else
|
||||||
static inline void wrong_size(void)
|
static inline void wrong_size(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline void __builtin_constant_p(int x)
|
#if !(defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C < 0x590)))
|
||||||
|
static inline int __builtin_constant_p(int x)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue