@@ -267,42 +267,39 @@ open_file(const char *path);
267
267
268
268
/* Compiler Attributes */
269
269
270
- #if defined(__GNUC__ ) && ( __GNUC__ >= 4 ) && !defined(__CYGWIN__ )
270
+ #if defined(__GNUC__ ) && !defined(__CYGWIN__ )
271
271
# define XKB_EXPORT __attribute__((visibility("default")))
272
- #elif defined(__SUNPRO_C ) && (__SUNPRO_C >= 0x550 )
273
- # define XKB_EXPORT __global
274
- #else /* not gcc >= 4 and not Sun Studio >= 8 */
272
+ #else
275
273
# define XKB_EXPORT
276
274
#endif
277
275
278
276
#if defined(__MINGW32__ )
279
277
# define ATTR_PRINTF (x ,y ) __attribute__((__format__(__MINGW_PRINTF_FORMAT, x, y)))
280
- #elif defined(__GNUC__ ) && (( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 203 )
278
+ #elif defined(__GNUC__ )
281
279
# define ATTR_PRINTF (x ,y ) __attribute__((__format__(__printf__, x, y)))
282
- #else /* not gcc >= 2.3 */
280
+ #else
283
281
# define ATTR_PRINTF (x ,y )
284
282
#endif
285
283
286
- #if (defined(__GNUC__ ) && ((__GNUC__ * 100 + __GNUC_MINOR__ ) >= 205 )) \
287
- || (defined(__SUNPRO_C ) && (__SUNPRO_C >= 0x590 ))
284
+ #if defined(__GNUC__ )
288
285
# define ATTR_NORETURN __attribute__((__noreturn__))
289
286
#else
290
287
# define ATTR_NORETURN
291
288
#endif /* GNUC */
292
289
293
- #if ( defined(__GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 296 )
290
+ #if defined(__GNUC__ )
294
291
#define ATTR_MALLOC __attribute__((__malloc__))
295
292
#else
296
293
#define ATTR_MALLOC
297
294
#endif
298
295
299
- #if defined(__GNUC__ ) && ( __GNUC__ >= 4 )
296
+ #if defined(__GNUC__ )
300
297
# define ATTR_NULL_SENTINEL __attribute__((__sentinel__))
301
298
#else
302
299
# define ATTR_NULL_SENTINEL
303
- #endif /* GNUC >= 4 */
300
+ #endif
304
301
305
- #if ( defined(__GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 295 )
302
+ #if defined(__GNUC__ )
306
303
#define ATTR_PACKED __attribute__((__packed__))
307
304
#else
308
305
#define ATTR_PACKED
0 commit comments