mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-04-25 03:15:16 +02:00
Code

47785: remove deprecated autoconf functions 

STDC_HEADERS and TIME_WITH_SYS_TIME are deprecated.
This commit is contained in:
Felipe Contreras 2020-12-30 23:41:30 -06:00 committed by Oliver Kiddle
parent 62e86515e7
commit df48cc8404
5 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2021-04-09 Oliver Kiddle <opk@zsh.org>
* Felipe Contreras: 47785: Src/Modules/files.c, Src/zsh_system.h,
Src/mem.c, configure.ac: remove deprecated autoconf functions
2021-04-08 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 48416: Completion/Unix/Command/_gcore: support macOS, with

6
Src/Modules/files.c
View File

@ -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"

16
Src/mem.c
View File

@ -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 */

21
Src/zsh_system.h
View File

@ -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>

4
configure.ac
View File

@ -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