From 91e5f2e441de61f8a2130b9eb5bf5ae0ada00357 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 16 Apr 2012 22:45:14 -0400 Subject: [PATCH] ia64: ucontext.h: drop __cplusplus Building a lot of glibc files trigger warnings like so: .../ucontext.h:52:25: warning: variably modified '_pad' at file scope The ia64 header protects the use of __builtin_offsetof by a C++ compiler, but this builtin works just fine with C compilers, so allow it to be used there too. Signed-off-by: Mike Frysinger --- ChangeLog.ia64 | 5 +++++ sysdeps/unix/sysv/linux/ia64/sys/ucontext.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.ia64 b/ChangeLog.ia64 index fea8582..803a248 100644 --- a/ChangeLog.ia64 +++ b/ChangeLog.ia64 @@ -1,5 +1,10 @@ 2012-04-27 Mike Frysinger + * sysdeps/unix/sysv/linux/ia64/sys/ucontext.h: Delete __cplusplus + define check. + +2012-04-27 Mike Frysinger + * sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h (pthread_attr_t): Change union tag to pthread_attr_t. Only define typedef if not already defined. diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h b/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h index 8525007..e1fa8c6 100644 --- a/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ typedef struct sigcontext mcontext_t; -#if defined __cplusplus && __GNUC_PREREQ (3, 5) +#if __GNUC_PREREQ (3, 5) # define _SC_GR0_OFFSET \ __builtin_offsetof (struct sigcontext, sc_gr[0]) #elif defined __GNUC__ -- 2.7.4