From b3119f181de14c17aaf923846713526fd82891bf Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 31 Mar 2010 07:57:51 -0600 Subject: [PATCH] sys_time: avoid compiler warnings sys/time uses #if/#else/#endif, and is therefore not subject to the gcc optimization. The #pragma GCC system_header must occur up front. * lib/sys_time.in.h (includes): Ensure gcc pragma is unconditional, fixing regression from 2010-03-29. Reported by Simon Josefsson. Signed-off-by: Eric Blake --- ChangeLog | 7 +++++++ lib/sys_time.in.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87b2083711..23db9606bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-03-31 Eric Blake + + sys_time: avoid compiler warnings + * lib/sys_time.in.h (includes): Ensure gcc pragma is + unconditional, fixing regression from 2010-03-29. + Reported by Simon Josefsson. + 2010-03-28 Jose E. Marchesi maint.mk: s/_header_without_use/_sc_header_without_use/ diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 6d818d1e81..6e0c7db984 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -18,12 +18,12 @@ /* Written by Paul Eggert. */ -#if defined _GL_SYS_TIME_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif +#if defined _GL_SYS_TIME_H + /* Simply delegate to the system's header, without adding anything. */ # if @HAVE_SYS_TIME_H@ # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -- 2.30.2