Browse Source

Ticket #1780: removing own declaration of errno and strerror()

Enrico Weigelt, metux IT service 15 years ago
parent
commit
f6637e4871
3 changed files with 2 additions and 18 deletions
  1. 1 1
      configure.ac
  2. 1 8
      vfs/samba/configure.ac
  3. 0 9
      vfs/samba/include/includes.h

+ 1 - 1
configure.ac

@@ -164,7 +164,7 @@ AC_CHECK_FUNCS([\
 	initgroups isascii \
 	initgroups isascii \
 	memcpy memset \
 	memcpy memset \
 	putenv \
 	putenv \
-	setreuid statfs strerror sysconf \
+	setreuid statfs sysconf \
 	tcgetattr tcsetattr truncate \
 	tcgetattr tcsetattr truncate \
 ])
 ])
 
 

+ 1 - 8
vfs/samba/configure.ac

@@ -78,13 +78,6 @@ AC_CHECK_TYPE(ssize_t, int)
 # we need libdl for PAM and the new VFS code
 # we need libdl for PAM and the new VFS code
 AC_CHECK_LIB(dl,main)
 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.
 # stupid glibc has the functions but no declaration. grrrr.
 AC_CACHE_CHECK([for crypt declaration],samba_cv_have_crypt_decl,[
 AC_CACHE_CHECK([for crypt declaration],samba_cv_have_crypt_decl,[
     AC_TRY_COMPILE([#include <unistd.h>],[int i = (int)crypt],
     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
 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(fstat strchr utime utimes getrlimit fsync memset)
 AC_CHECK_FUNCS(memmove vsnprintf snprintf setsid glob pipe crypt16 getauthuid)
 AC_CHECK_FUNCS(memmove vsnprintf snprintf setsid glob pipe crypt16 getauthuid)
 AC_CHECK_FUNCS(sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent)
 AC_CHECK_FUNCS(sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent)

+ 0 - 9
vfs/samba/include/includes.h

@@ -454,20 +454,11 @@
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 #endif
 
 
-#ifndef HAVE_STRERROR
-extern char *sys_errlist[];
-#define strerror(i) sys_errlist[i]
-#endif
-
 #ifndef HAVE_STRCHR
 #ifndef HAVE_STRCHR
 # define strchr                 index
 # define strchr                 index
 # define strrchr                rindex
 # define strrchr                rindex
 #endif
 #endif
 
 
-#ifndef HAVE_ERRNO_DECL
-extern int errno;
-#endif
-
 #ifdef HAVE_BROKEN_GETGROUPS
 #ifdef HAVE_BROKEN_GETGROUPS
 #define GID_T int
 #define GID_T int
 #else
 #else