From 3e982cf3fc917a357c383533d34e5fd3cda308d4 Mon Sep 17 00:00:00 2001
From: "Andrew V. Samoilov" <sav@bcs.zp.ua>
Date: Mon, 29 Jul 2002 15:19:36 +0000
Subject: [PATCH] * samba/configure.in: Don't check for union semun. *
 samba/include/includes.h [!HAVE_UNION_SEMUN]: Don't declare union semun.

---
 vfs/ChangeLog                |  6 ++++++
 vfs/samba/configure.in       | 11 -----------
 vfs/samba/include/includes.h | 10 ----------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 1603923b2..97b800f45 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-29  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* samba/configure.in: Don't check for union semun.
+	* samba/include/includes.h [!HAVE_UNION_SEMUN]: Don't
+	declare union semun.
+
 2002-07-26  Pavel Roskin  <proski@gnu.org>
 
 	* direntry.c (vfs_s_find_entry_linear): Canonicalize path before
diff --git a/vfs/samba/configure.in b/vfs/samba/configure.in
index a3f6f4ebb..14f6753a3 100644
--- a/vfs/samba/configure.in
+++ b/vfs/samba/configure.in
@@ -244,17 +244,6 @@ if test x"$samba_cv_have_longlong" = x"yes"; then
     AC_DEFINE(HAVE_LONGLONG, 1, [Define if long long is usable])
 fi
 
-AC_CACHE_CHECK([for union semun],samba_cv_HAVE_UNION_SEMUN,[
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-main() { union semun ss; exit(0); }],
-samba_cv_HAVE_UNION_SEMUN=yes,samba_cv_HAVE_UNION_SEMUN=no,samba_cv_HAVE_UNION_SEMUN=cross)])
-if test x"$samba_cv_HAVE_UNION_SEMUN" = x"yes"; then
-    AC_DEFINE(HAVE_UNION_SEMUN, 1, [Defne if union semun is already defined])
-fi
-
 AC_CACHE_CHECK([for sin_len in sock],samba_cv_HAVE_SOCK_SIN_LEN,[
 AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>
diff --git a/vfs/samba/include/includes.h b/vfs/samba/include/includes.h
index cdd447e42..0b6c8d870 100644
--- a/vfs/samba/include/includes.h
+++ b/vfs/samba/include/includes.h
@@ -603,16 +603,6 @@ extern int errno;
 #define MAP_FILE 0
 #endif
 
-#ifdef HAVE_SYSV_IPC
-#ifndef HAVE_UNION_SEMUN
-union semun {
-	int val;
-	struct semid_ds *buf;
-	unsigned short *array;
-};
-#endif
-#endif
-
 #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP))
 #define USE_SMBPASS_DB 1
 #endif