From: Paul Eggert Date: Tue, 14 Feb 2017 16:46:05 +0000 (-0800) Subject: selinux-h: port to PGI 16.10 X-Git-Tag: v1.0~6362 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e041ac5f63e23b20c322f2777d6330074c8a7215;p=gnulib.git selinux-h: port to PGI 16.10 * lib/se-selinux.in.h: Don't assume that include_next skips over duplicate -I DIR options. --- diff --git a/ChangeLog b/ChangeLog index bb5e75cbc3..5b52789672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-02-14 Paul Eggert + selinux-h: port to PGI 16.10 + * lib/se-selinux.in.h: Don't assume that include_next skips over + duplicate -I DIR options. + argp: port to PGI 16.10 * lib/argp-pin.c (dummy): Declare as needed to make file nonempty. diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h index cd1995164b..1cf7c00ea3 100644 --- a/lib/se-selinux.in.h +++ b/lib/se-selinux.in.h @@ -14,26 +14,25 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef _@GUARD_PREFIX@_SELINUX_SELINUX_H -# define _@GUARD_PREFIX@_SELINUX_SELINUX_H - -# if __GNUC__ >= 3 +#if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ -# endif +#endif @PRAGMA_COLUMNS@ -# if HAVE_SELINUX_SELINUX_H +#if HAVE_SELINUX_SELINUX_H #@INCLUDE_NEXT@ @NEXT_SELINUX_SELINUX_H@ -# else +#else +# if !defined _@GUARD_PREFIX@_SELINUX_SELINUX_H +# define _@GUARD_PREFIX@_SELINUX_SELINUX_H # include # include -#ifndef _GL_INLINE_HEADER_BEGIN - #error "Please include config.h first." -#endif +# ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +# endif _GL_INLINE_HEADER_BEGIN # ifndef SE_SELINUX_INLINE # define SE_SELINUX_INLINE _GL_INLINE @@ -114,10 +113,10 @@ matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER, # define GNULIB_defined_security_types 1 # endif -#ifndef _GL_INLINE_HEADER_BEGIN - #error "Please include config.h first." -#endif +# ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +# endif _GL_INLINE_HEADER_BEGIN # endif -#endif /* _@GUARD_PREFIX@_SELINUX_SELINUX_H */ +#endif