From: Jim Meyering <meyering@redhat.com>
Date: Tue, 21 Oct 2008 15:18:53 +0000 (+0200)
Subject: se-linux-h: remove ENOTSUPP-defining code; instead, use errno
X-Git-Tag: v0.1~6790
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=1c52cbc43c09a8ce5744a54c8f5f3ef61c26765a;p=gnulib.git

se-linux-h: remove ENOTSUPP-defining code; instead, use errno

* modules/selinux-h (Depends-on): Add errno.
(configure.ac): Add AC_REQUIRE([AC_C_INLINE]).
* lib/se-context.in.h: Remove code to define ENOTSUPP.
* lib/se-selinux.in.h: Likewise.
---

diff --git a/lib/se-context.in.h b/lib/se-context.in.h
index ec88a0318..f9fe9237d 100644
--- a/lib/se-context.in.h
+++ b/lib/se-context.in.h
@@ -2,15 +2,6 @@
 # define SELINUX_CONTEXT_H
 
 # include <errno.h>
-/* Some systems don't have ENOTSUP.  */
-# ifndef ENOTSUP
-#  ifdef ENOSYS
-#   define ENOTSUP ENOSYS
-#  else
-/* Some systems don't have ENOSYS either.  */
-#   define ENOTSUP EINVAL
-#  endif
-# endif
 
 typedef int context_t;
 static inline context_t context_new (char const *s)
diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h
index aeaf95002..ce6448720 100644
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -3,15 +3,6 @@
 
 # include <sys/types.h>
 # include <errno.h>
-/* Some systems don't have ENOTSUP.  */
-# ifndef ENOTSUP
-#  ifdef ENOSYS
-#   define ENOTSUP ENOSYS
-#  else
-/* Some systems don't have ENOSYS either.  */
-#   define ENOTSUP EINVAL
-#  endif
-# endif
 
 typedef unsigned short security_class_t;
 # define security_context_t char*
diff --git a/modules/selinux-h b/modules/selinux-h
index 603e057f0..05cdd71f2 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -8,10 +8,12 @@ m4/selinux-context-h.m4
 m4/selinux-selinux-h.m4
 
 Depends-on:
+errno
 
 configure.ac:
 gl_HEADERS_SELINUX_SELINUX_H
 gl_HEADERS_SELINUX_CONTEXT_H
+AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
 lib_SOURCES += se-context.in.h se-selinux.in.h