67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
From e041ac5f63e23b20c322f2777d6330074c8a7215 Mon Sep 17 00:00:00 2001
|
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
Date: Tue, 14 Feb 2017 08:46:05 -0800
|
|
Subject: selinux-h: port to PGI 16.10
|
|
|
|
* gnu/se-selinux.in.h: Don't assume that include_next skips over
|
|
duplicate -I DIR options.
|
|
|
|
diff --git a/gnu/se-selinux.in.h b/gnu/se-selinux.in.h
|
|
index cd19951..1cf7c00 100644
|
|
--- a/gnu/se-selinux.in.h
|
|
+++ b/gnu/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 <http://www.gnu.org/licenses/>. */
|
|
|
|
-#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 <sys/types.h>
|
|
# include <errno.h>
|
|
|
|
-#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
|
|
--
|
|
cgit v1.0-41-gc330
|
|
|