[src/trunk]: src/usr.bin/make make: indent preprocessor directives consistently

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46f92b314825
branches:  trunk
changeset: 950844:46f92b314825
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Feb 01 21:09:25 2021 +0000

description:
make: indent preprocessor directives consistently

As seen in share/misc/style.

diffstat:

 usr.bin/make/filemon/filemon_dev.c |   4 ++--
 usr.bin/make/job.c                 |  10 +++++-----
 usr.bin/make/make.h                |  20 ++++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs (98 lines):

diff -r 0c110f025823 -r 46f92b314825 usr.bin/make/filemon/filemon_dev.c
--- a/usr.bin/make/filemon/filemon_dev.c        Mon Feb 01 21:04:10 2021 +0000
+++ b/usr.bin/make/filemon/filemon_dev.c        Mon Feb 01 21:09:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filemon_dev.c,v 1.7 2021/01/19 20:51:46 rillig Exp $   */
+/*     $NetBSD: filemon_dev.c,v 1.8 2021/02/01 21:09:25 rillig Exp $   */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #ifdef HAVE_FILEMON_H
-#  include <filemon.h>
+# include <filemon.h>
 #endif
 
 #ifndef _PATH_FILEMON
diff -r 0c110f025823 -r 46f92b314825 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Mon Feb 01 21:04:10 2021 +0000
+++ b/usr.bin/make/job.c        Mon Feb 01 21:09:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.411 2021/02/01 21:04:10 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.412 2021/02/01 21:09:25 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.411 2021/02/01 21:04:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.412 2021/02/01 21:09:25 rillig Exp $");
 
 /*
  * A shell defines how the commands are run.  All commands for a target are
@@ -1471,12 +1471,12 @@
                 * commit suicide.
                 */
 #if defined(MAKE_NATIVE) || defined(HAVE_SETPGID)
-#  if defined(SYSV)
+# if defined(SYSV)
                /* XXX: dsl - I'm sure this should be setpgrp()... */
                (void)setsid();
-#  else
+# else
                (void)setpgid(0, getpid());
-#  endif
+# endif
 #endif
 
                (void)execv(shellPath, argv);
diff -r 0c110f025823 -r 46f92b314825 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Mon Feb 01 21:04:10 2021 +0000
+++ b/usr.bin/make/make.h       Mon Feb 01 21:09:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.248 2021/02/01 21:04:10 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.249 2021/02/01 21:09:25 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -521,8 +521,8 @@
 /* Used for .include "...". */
 extern SearchPath *parseIncPath;
 /*
- * Used for .include <...>, for the built-in sys.mk and makefiles from the
- * command line arguments.
+ * Used for .include <...>, for the built-in sys.mk and for makefiles from
+ * the command line arguments.
  */
 extern SearchPath *sysIncPath;
 /* The default for sysIncPath. */
@@ -832,18 +832,18 @@
 }
 
 #if defined(lint)
-#  define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
+# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
 #elif defined(MAKE_NATIVE)
-#  include <sys/cdefs.h>
-#  define MAKE_RCSID(id) __RCSID(id)
+# include <sys/cdefs.h>
+# define MAKE_RCSID(id) __RCSID(id)
 #elif defined(MAKE_ALL_IN_ONE) && defined(__COUNTER__)
-#  define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y)
-#  define MAKE_RCSID(id) static volatile char \
+# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y)
+# define MAKE_RCSID(id) static volatile char \
        MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id
 #elif defined(MAKE_ALL_IN_ONE)
-#  define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
+# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
 #else
-#  define MAKE_RCSID(id) static volatile char rcsid[] = id
+# define MAKE_RCSID(id) static volatile char rcsid[] = id
 #endif
 
 #endif /* MAKE_MAKE_H */