From 6482e63403a3d13bf42f5029407b6151ad9f4ca5 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 7 Jun 2017 10:53:49 +0530 Subject: Add include guards to dl-procinfo.h The dl-procinfo.h for linux/s390 and linux/i386 don't have include guards, which causes them to fail since addition of LD_HWCAP_MASK to tunables. Add _DL_I386_PROCINFO_H guard to avoid redefining _dl_procinfo on multiple includes and also allow the subsequent include of another dl-procinfo.h to work. Verified with a build test on i686. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Add include guard. * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: Likewise. --- sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 3 +++ sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 3 +++ 2 files changed, 6 insertions(+) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index a3a5f9d277..c590896ddf 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -17,6 +17,8 @@ License along with the GNU C Library; if not, see . */ +#ifndef _DL_I386_PROCINFO_H +#define _DL_I386_PROCINFO_H 1 #include #undef _dl_procinfo @@ -42,3 +44,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } +#endif diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h index e756663107..7cbce0a043 100644 --- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h @@ -17,6 +17,8 @@ License along with the GNU C Library; if not, see . */ +#ifndef _DL_S390_PROCINFO_H +#define _DL_S390_PROCINFO_H 1 #include #include @@ -44,3 +46,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } +#endif -- cgit 1.4.1