From f6637e487108da18dc77c16e3fd76e4e4cadda07 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT service" <weigelt@metux.de>
Date: Mon, 2 Nov 2009 04:55:29 +0100
Subject: [PATCH] Ticket #1780: removing own declaration of errno and
 strerror()

---
 configure.ac                 | 2 +-
 vfs/samba/configure.ac       | 9 +--------
 vfs/samba/include/includes.h | 9 ---------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 661836c0b..d6a6eeaee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,7 @@ AC_CHECK_FUNCS([\
 	initgroups isascii \
 	memcpy memset \
 	putenv \
-	setreuid statfs strerror sysconf \
+	setreuid statfs sysconf \
 	tcgetattr tcsetattr truncate \
 ])
 
diff --git a/vfs/samba/configure.ac b/vfs/samba/configure.ac
index d58eac708..18ca147d8 100644
--- a/vfs/samba/configure.ac
+++ b/vfs/samba/configure.ac
@@ -78,13 +78,6 @@ AC_CHECK_TYPE(ssize_t, int)
 # we need libdl for PAM and the new VFS code
 AC_CHECK_LIB(dl,main)
 
-AC_CACHE_CHECK([for errno in errno.h],samba_cv_errno, [
-    AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
-	samba_cv_errno=yes,samba_cv_have_errno=no)])
-if test x"$samba_cv_errno" = x"yes"; then
-   AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define if errno is declared])
-fi
-
 # stupid glibc has the functions but no declaration. grrrr.
 AC_CACHE_CHECK([for crypt declaration],samba_cv_have_crypt_decl,[
     AC_TRY_COMPILE([#include <unistd.h>],[int i = (int)crypt],
@@ -138,7 +131,7 @@ if test x"$ac_cv_func_connect" = x"no"; then
     fi
 fi
 
-AC_CHECK_FUNCS(waitpid getcwd strtoul strerror chown chmod)
+AC_CHECK_FUNCS(waitpid getcwd strtoul chown chmod)
 AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync memset)
 AC_CHECK_FUNCS(memmove vsnprintf snprintf setsid glob pipe crypt16 getauthuid)
 AC_CHECK_FUNCS(sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent)
diff --git a/vfs/samba/include/includes.h b/vfs/samba/include/includes.h
index 8da853dce..8a201ed12 100644
--- a/vfs/samba/include/includes.h
+++ b/vfs/samba/include/includes.h
@@ -454,20 +454,11 @@
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef HAVE_STRERROR
-extern char *sys_errlist[];
-#define strerror(i) sys_errlist[i]
-#endif
-
 #ifndef HAVE_STRCHR
 # define strchr                 index
 # define strrchr                rindex
 #endif
 
-#ifndef HAVE_ERRNO_DECL
-extern int errno;
-#endif
-
 #ifdef HAVE_BROKEN_GETGROUPS
 #define GID_T int
 #else