Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 2/3] autoconf: remove deprecated functions
- X-seq: zsh-workers 47785
- From: Felipe Contreras <felipe.contreras@xxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 2/3] autoconf: remove deprecated functions
- Date: Wed, 30 Dec 2020 23:41:30 -0600
- Archived-at: <https://zsh.org/workers/47785>
- Archived-at: <http://www.zsh.org/sympa/arcsearch_id/zsh-workers/2020-12/20201231054131.682544-3-felipe.contreras%40gmail.com>
- Authentication-results: zsh.org; iprev=pass (mail-ot1-f44.google.com) smtp.remote-ip=209.85.210.44; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none
- Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Qn7zu+oa7I69hnvOSWbq285xEGgw+bJc2C72njzF4Y=; b=D5QNFDyi+zYQpcJZ4ozLfQOYKK31SIXTMSx324ctR8T4yhWC/xdrqogayJbJPlV53c prvO9YJwt9quxQYpGa09ztbEIq7TnhkQ6I9xvBDXlKX3xzsXq8IcDniRq8DWBoE1gaho H6EFVdHd0YGPcn+snew/l0c8LABGcaId3GVH9cvuYk/Qx/JhF8bMNokjiQ63GBU1IJSf cGdt6bvqTY2WUe9xY0R/LQxeMhpKrKx/DwMkEYj1day5GcnmIczdUH7Z03hmROKnMVam JsMdKRcHhqe2eEAlTi4wIikVsnM0WrgIrGF6pRlIIbQURa9BsyEwKV//3R85qIhVLFw9 S8Kw==
- In-reply-to: <20201231054131.682544-1-felipe.contreras@gmail.com>
- List-archive: <http://www.zsh.org/sympa/arc/zsh-workers>
- List-help: <mailto:sympa@zsh.org?subject=help>
- List-id: <zsh-workers.zsh.org>
- List-owner: <mailto:zsh-workers-request@zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- List-subscribe: <mailto:sympa@zsh.org?subject=subscribe%20zsh-workers>
- List-unsubscribe: <mailto:sympa@zsh.org?subject=unsubscribe%20zsh-workers>
- References: <20201231054131.682544-1-felipe.contreras@gmail.com>
- Sender: zsh-workers-request@xxxxxxx
STDC_HEADERS and TIME_WITH_SYS_TIME are deprecated.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
Src/Modules/files.c | 6 ------
Src/mem.c | 16 ++++------------
Src/zsh_system.h | 21 ++-------------------
configure.ac | 4 +---
4 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/Src/Modules/files.c b/Src/Modules/files.c
index 7ebacba6c..a1d6f6bf2 100644
--- a/Src/Modules/files.c
+++ b/Src/Modules/files.c
@@ -32,12 +32,6 @@
typedef int (*MoveFunc) _((char const *, char const *));
typedef int (*RecurseFunc) _((char *, char *, struct stat const *, void *));
-#ifndef STDC_HEADERS
-extern int link _((const char *, const char *));
-extern int symlink _((const char *, const char *));
-extern int rename _((const char *, const char *));
-#endif
-
struct recursivecmd;
#include "files.pro"
diff --git a/Src/mem.c b/Src/mem.c
index 5951e57ed..25b2bbce7 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -1072,18 +1072,10 @@ zrealloc(void *ptr, size_t size)
# endif
#endif
-#if defined(_BSD) && !defined(STDC_HEADERS)
-# define FREE_RET_T int
-# define FREE_ARG_T char *
-# define FREE_DO_RET
-# define MALLOC_RET_T char *
-# define MALLOC_ARG_T size_t
-#else
-# define FREE_RET_T void
-# define FREE_ARG_T void *
-# define MALLOC_RET_T void *
-# define MALLOC_ARG_T size_t
-#endif
+#define FREE_RET_T void
+#define FREE_ARG_T void *
+#define MALLOC_RET_T void *
+#define MALLOC_ARG_T size_t
/* structure for building free list in blocks holding small blocks */
diff --git a/Src/zsh_system.h b/Src/zsh_system.h
index 161b073b4..6f4efce96 100644
--- a/Src/zsh_system.h
+++ b/Src/zsh_system.h
@@ -235,16 +235,8 @@ char *alloca _((size_t));
# include <errno.h>
#endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+#include <sys/time.h>
+#include <time.h>
/* This is needed by some old SCO unices */
#if !defined(HAVE_STRUCT_TIMEZONE) && !defined(ZSH_OOT_MODULE)
@@ -279,16 +271,7 @@ struct timespec {
# include <sys/times.h>
#endif
-#if STDC_HEADERS || HAVE_STRING_H
# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict. */
-# if !STDC_HEADERS && HAVE_MEMORY_H
-# include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems. */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
#ifdef HAVE_LOCALE_H
# include <locale.h>
diff --git a/configure.ac b/configure.ac
index 549cae3d6..c39915528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl
AC_INIT
AC_CONFIG_SRCDIR([Src/zsh.h])
AC_PREREQ([2.69])
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
dnl What version of zsh are we building ?
. ${srcdir}/Config/version.mk
@@ -657,8 +657,6 @@ dnl ------------------
dnl CHECK HEADER FILES
dnl ------------------
AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_TIME
AC_HEADER_STAT
AC_HEADER_SYS_WAIT
--
2.30.0
Messages sorted by:
Reverse Date,
Date,
Thread,
Author