From e2b67a33ba69019e66e145a9b84bda01f2efdd51 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 2 Jan 2012 10:34:52 +0300 Subject: [PATCH] Ticket #2740: code cleanup before 4.8.2 release. Removes references to AC_HEADER_STDC macro, marked as obsolescent in the Autoconf 2.60 release. Signed-off-by: Andrew Borodin --- configure.ac | 1 - lib/global.h | 8 +++----- src/vfs/smbfs/helpers/configure.ac | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 852b53d50..c17234f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ AC_CHECK_HEADERS([unistd.h string.h memory.h limits.h malloc.h \ AC_HEADER_TIME AC_HEADER_DIRENT -AC_HEADER_STDC dnl Missing structure components AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev]) diff --git a/lib/global.h b/lib/global.h index 39c660362..95a979886 100644 --- a/lib/global.h +++ b/lib/global.h @@ -7,14 +7,12 @@ #ifndef MC_GLOBAL_H #define MC_GLOBAL_H -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) +#if defined(HAVE_STRING_H) #include /* An ANSI string.h and pre-ANSI memory.h might conflict */ -#if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) +#elif defined(HAVE_MEMORY_H) #include -#endif /* !STDC_HEADERS & HAVE_MEMORY_H */ - -#else /* !STDC_HEADERS & !HAVE_STRING_H */ +#else #include /* memory and strings.h conflict on other systems */ #endif /* !STDC_HEADERS & !HAVE_STRING_H */ diff --git a/src/vfs/smbfs/helpers/configure.ac b/src/vfs/smbfs/helpers/configure.ac index 902f911ac..060e372d0 100644 --- a/src/vfs/smbfs/helpers/configure.ac +++ b/src/vfs/smbfs/helpers/configure.ac @@ -38,7 +38,6 @@ AC_VALIDATE_CACHE_SYSTEM_TYPE SAMBA_MAINTAINER_MODE AC_INLINE -AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h) -- 2.11.4.GIT