Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): inline macro STATIC



details:   https://anonhg.NetBSD.org/src/rev/c8663770bbbb
branches:  trunk
changeset: 941656:c8663770bbbb
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Oct 25 20:34:05 2020 +0000

description:
make(1): inline macro STATIC

It was a leftover from the remote code, which was removed on 2006-03-11.

diffstat:

 usr.bin/make/job.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 052d3d3a16d7 -r c8663770bbbb usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Oct 25 20:29:51 2020 +0000
+++ b/usr.bin/make/job.c        Sun Oct 25 20:34:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.284 2020/10/25 20:29:51 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.285 2020/10/25 20:34:05 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,9 +143,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.284 2020/10/25 20:29:51 rillig Exp $");
-
-# define STATIC static
+MAKE_RCSID("$NetBSD: job.c,v 1.285 2020/10/25 20:34:05 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
@@ -376,8 +374,8 @@
 static char *shellArgv = NULL; /* Custom shell args */
 
 
-STATIC Job     *job_table;     /* The structures that describe them */
-STATIC Job     *job_table_end; /* job_table + maxJobs */
+static Job *job_table;         /* The structures that describe them */
+static Job *job_table_end;     /* job_table + maxJobs */
 static unsigned int wantToken; /* we want a token */
 static int lurking_children = 0;
 static int make_suspended = 0; /* non-zero if we've seen a SIGTSTP (etc) */
@@ -393,7 +391,7 @@
 static void clearfd(Job *);
 static int readyfd(Job *);
 
-STATIC GNode *lastNode;                /* The node for which output was most recently
+static GNode *lastNode;                /* The node for which output was most recently
                                 * produced. */
 static char *targPrefix = NULL; /* What we print at the start of TARG_FMT */
 static Job tokenWaitJob;       /* token wait pseudo-job */
@@ -1724,7 +1722,7 @@
  *     curPos may be shifted as may the contents of outBuf.
  *-----------------------------------------------------------------------
  */
-STATIC void
+static void
 JobDoOutput(Job *job, Boolean finish)
 {
     Boolean gotNL = FALSE;     /* true if got a newline */



Home | Main Index | Thread Index | Old Index