Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): use space instead of tab for preprocessor directives

This commit is contained in:
rillig 2020-11-29 09:27:40 +00:00
parent 95906832b0
commit 84085cca68
11 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/config.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: config.h,v 1.25 2020/10/19 23:43:55 rillig Exp $ */
/* $NetBSD: config.h,v 1.26 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -104,7 +104,7 @@
* Is the suffix used to denote libraries and is used by the Suff module
* to find the search path on which to seek any -l<xx> targets.
*/
#define LIBSUFF ".a"
#define LIBSUFF ".a"
/*
* RECHECK
@ -119,7 +119,7 @@
* On systems that don't have this problem, you should define this.
* Under NFS you probably should not, unless you aren't exporting jobs.
*/
#define RECHECK
#define RECHECK
/*
* POSIX

10
usr.bin/make/dir.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dir.h,v 1.38 2020/11/29 08:48:24 rillig Exp $ */
/* $NetBSD: dir.h,v 1.39 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -72,8 +72,8 @@
* from: @(#)dir.h 8.1 (Berkeley) 6/6/93
*/
#ifndef MAKE_DIR_H
#define MAKE_DIR_H
#ifndef MAKE_DIR_H
#define MAKE_DIR_H
typedef struct CachedDir CachedDir;
@ -98,8 +98,8 @@ SearchPath *Dir_CopyDirSearchPath(void);
/* Stripped-down variant of struct stat. */
struct cached_stat {
time_t cst_mtime;
mode_t cst_mode;
time_t cst_mtime;
mode_t cst_mode;
};
int cached_lstat(const char *, struct cached_stat *);

6
usr.bin/make/filemon/filemon.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: filemon.h,v 1.3 2020/10/18 11:49:47 rillig Exp $ */
/* $NetBSD: filemon.h,v 1.4 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#ifndef MAKE_FILEMON_H
#define MAKE_FILEMON_H
#define MAKE_FILEMON_H
#include <sys/types.h>
@ -50,4 +50,4 @@ int filemon_setpid_child(const struct filemon *, pid_t);
int filemon_readfd(const struct filemon *);
int filemon_process(struct filemon *);
#endif /* MAKE_FILEMON_H */
#endif /* MAKE_FILEMON_H */

4
usr.bin/make/filemon/filemon_dev.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: filemon_dev.c,v 1.5 2020/11/23 23:41:11 rillig Exp $ */
/* $NetBSD: filemon_dev.c,v 1.6 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
#endif
#ifndef _PATH_FILEMON
#define _PATH_FILEMON "/dev/filemon"
#define _PATH_FILEMON "/dev/filemon"
#endif
struct filemon {

4
usr.bin/make/filemon/filemon_ktrace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: filemon_ktrace.c,v 1.7 2020/11/28 16:31:34 rillig Exp $ */
/* $NetBSD: filemon_ktrace.c,v 1.8 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define _KERNTYPES /* register_t */
#define _KERNTYPES /* register_t */
#include "filemon.h"

6
usr.bin/make/hash.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hash.h,v 1.36 2020/11/23 18:24:05 rillig Exp $ */
/* $NetBSD: hash.h,v 1.37 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -74,8 +74,8 @@
/* Hash tables with strings as keys and arbitrary pointers as values. */
#ifndef MAKE_HASH_H
#define MAKE_HASH_H
#ifndef MAKE_HASH_H
#define MAKE_HASH_H
/* A single key-value entry in the hash table. */
typedef struct HashEntry {

8
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.333 2020/11/28 19:12:28 rillig Exp $ */
/* $NetBSD: job.c,v 1.334 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: job.c,v 1.333 2020/11/28 19:12:28 rillig Exp $");
MAKE_RCSID("$NetBSD: job.c,v 1.334 2020/11/29 09:27:40 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@ -395,8 +395,8 @@ static char *targPrefix = NULL; /* What we print at the start of TARG_FMT */
static Job tokenWaitJob; /* token wait pseudo-job */
static Job childExitJob; /* child exit pseudo-job */
#define CHILD_EXIT "."
#define DO_JOB_RESUME "R"
#define CHILD_EXIT "."
#define DO_JOB_RESUME "R"
enum { npseudojobs = 2 }; /* number of pseudo-jobs */

6
usr.bin/make/job.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.h,v 1.63 2020/11/14 13:27:01 rillig Exp $ */
/* $NetBSD: job.h,v 1.64 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -97,8 +97,8 @@ struct emul_pollfd {
short revents;
};
#define POLLIN 0x0001
#define POLLOUT 0x0004
#define POLLIN 0x0001
#define POLLOUT 0x0004
int
emul_poll(struct pollfd *fd, int nfd, int timeout);

16
usr.bin/make/make.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: make.h,v 1.229 2020/11/29 01:40:26 rillig Exp $ */
/* $NetBSD: make.h,v 1.230 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -102,25 +102,25 @@
#endif
#if defined(__GNUC__)
#define MAKE_GNUC_PREREQ(x, y) \
#define MAKE_GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
(__GNUC__ > (x)))
#else /* defined(__GNUC__) */
#define MAKE_GNUC_PREREQ(x, y) 0
#define MAKE_GNUC_PREREQ(x, y) 0
#endif /* defined(__GNUC__) */
#if MAKE_GNUC_PREREQ(2, 7)
#define MAKE_ATTR_UNUSED __attribute__((__unused__))
#define MAKE_ATTR_UNUSED __attribute__((__unused__))
#else
#define MAKE_ATTR_UNUSED /* delete */
#define MAKE_ATTR_UNUSED /* delete */
#endif
#if MAKE_GNUC_PREREQ(2, 5)
#define MAKE_ATTR_DEAD __attribute__((__noreturn__))
#define MAKE_ATTR_DEAD __attribute__((__noreturn__))
#elif defined(__GNUC__)
#define MAKE_ATTR_DEAD __volatile
#define MAKE_ATTR_DEAD __volatile
#else
#define MAKE_ATTR_DEAD /* delete */
#define MAKE_ATTR_DEAD /* delete */
#endif
#if MAKE_GNUC_PREREQ(2, 7)

6
usr.bin/make/meta.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meta.c,v 1.153 2020/11/28 18:55:52 rillig Exp $ */
/* $NetBSD: meta.c,v 1.154 2020/11/29 09:27:40 rillig Exp $ */
/*
* Implement 'meta' mode.
@ -82,7 +82,7 @@ static Boolean metaSilent = FALSE; /* if we have a .meta be SILENT */
extern Boolean forceJobs;
extern char **environ;
#define MAKE_META_PREFIX ".MAKE.META.PREFIX"
#define MAKE_META_PREFIX ".MAKE.META.PREFIX"
#ifndef N2U
# define N2U(n, u) (((n) + ((u) - 1)) / (u))
@ -1712,4 +1712,4 @@ meta_compat_parent(pid_t child)
}
}
#endif /* USE_META */
#endif /* USE_META */

14
usr.bin/make/pathnames.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pathnames.h,v 1.17 2009/04/11 09:41:18 apb Exp $ */
/* $NetBSD: pathnames.h,v 1.18 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1990, 1993
@ -39,15 +39,15 @@
#include <paths.h>
#endif
#define _PATH_OBJDIR "obj"
#define _PATH_OBJDIRPREFIX "/usr/obj"
#define _PATH_OBJDIR "obj"
#define _PATH_OBJDIRPREFIX "/usr/obj"
#ifndef _PATH_DEFSHELLDIR
#define _PATH_DEFSHELLDIR "/bin"
#define _PATH_DEFSHELLDIR "/bin"
#endif
#define _PATH_DEFSYSMK "sys.mk"
#define _PATH_DEFSYSMK "sys.mk"
#ifndef _PATH_DEFSYSPATH
#define _PATH_DEFSYSPATH "/usr/share/mk"
#define _PATH_DEFSYSPATH "/usr/share/mk"
#endif
#ifndef _PATH_TMP
#define _PATH_TMP "/tmp/" /* with trailing slash */
#define _PATH_TMP "/tmp/" /* with trailing slash */
#endif