mirror of
https://https.git.savannah.gnu.org/git/diffutils.git
synced 2026-01-27 01:44:20 +00:00
build: don't define macros that gnulib provides
* bootstrap.conf (gnulib_modules): Add signal, stdint. * lib/cmpbuf.c (SA_RESTART, SA_INTERRUPT): Remove definitions. (SIZE_MAX, PTRDIFF_MAX): Likewise. Include <stdint.h>. * src/system.h (WEXITSTATUS, WIFEXITED): Remove definitions. (SA_RESTART, SA_INTERRUPT): Likewise.
This commit is contained in:
parent
6ef1f1f708
commit
bec2cfcd8f
@ -55,9 +55,11 @@ progname
|
||||
propername
|
||||
regex
|
||||
sh-quote
|
||||
signal
|
||||
sigprocmask
|
||||
stat-macros
|
||||
stat-time
|
||||
stdint
|
||||
strcase
|
||||
strftime
|
||||
strptime
|
||||
|
||||
16
lib/cmpbuf.c
16
lib/cmpbuf.c
@ -20,28 +20,14 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <signal.h>
|
||||
#ifndef SA_RESTART
|
||||
# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
|
||||
# define SA_RESTART SA_INTERRUPT
|
||||
# else
|
||||
# define SA_RESTART 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
#include <sys/types.h>
|
||||
#include "cmpbuf.h"
|
||||
#include "intprops.h"
|
||||
|
||||
#ifndef PTRDIFF_MAX
|
||||
# define PTRDIFF_MAX TYPE_MAXIMUM (ptrdiff_t)
|
||||
#endif
|
||||
#ifndef SIZE_MAX
|
||||
# define SIZE_MAX TYPE_MAXIMUM (size_t)
|
||||
#endif
|
||||
#ifndef SSIZE_MAX
|
||||
# define SSIZE_MAX TYPE_MAXIMUM (ssize_t)
|
||||
#endif
|
||||
|
||||
13
src/system.h
13
src/system.h
@ -54,12 +54,6 @@
|
||||
#include <time.h>
|
||||
|
||||
#include <sys/wait.h>
|
||||
#ifndef WEXITSTATUS
|
||||
# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
|
||||
#endif
|
||||
#ifndef WIFEXITED
|
||||
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
|
||||
#endif
|
||||
|
||||
#include <dirent.h>
|
||||
#ifndef _D_EXACT_NAMLEN
|
||||
@ -111,13 +105,6 @@ int strcasecmp (char const *, char const *);
|
||||
#include <errno.h>
|
||||
|
||||
#include <signal.h>
|
||||
#ifndef SA_RESTART
|
||||
# ifdef SA_INTERRUPT /* e.g. SunOS 4.1.x */
|
||||
# define SA_RESTART SA_INTERRUPT
|
||||
# else
|
||||
# define SA_RESTART 0
|
||||
# endif
|
||||
#endif
|
||||
#if !defined SIGCHLD && defined SIGCLD
|
||||
# define SIGCHLD SIGCLD
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user