Module Name: othersrc
Committed By: dholland
Date: Mon Feb 25 03:45:27 UTC 2013
Modified Files:
othersrc/usr.bin/dholland-make2: make.h
Log Message:
Move enum decl out from inside of struct decl.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/dholland-make2/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/dholland-make2/make.h
diff -u othersrc/usr.bin/dholland-make2/make.h:1.4 othersrc/usr.bin/dholland-make2/make.h:1.5
--- othersrc/usr.bin/dholland-make2/make.h:1.4 Mon Feb 25 02:12:23 2013
+++ othersrc/usr.bin/dholland-make2/make.h Mon Feb 25 03:45:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.4 2013/02/25 02:12:23 dholland Exp $ */
+/* $NetBSD: make.h,v 1.5 2013/02/25 03:45:27 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -97,6 +97,20 @@
#include "config.h"
#include "buf.h"
+/*
+ * State of processing of a node.
+ */
+enum enum_made {
+ UNMADE, /* Not examined yet */
+ DEFERRED, /* Examined once (building child) */
+ REQUESTED, /* on toBeMade list */
+ BEINGMADE, /* Already being made; indicates a cycle in the graph. */
+ MADE, /* Was out-of-date and has been made. */
+ UPTODATE, /* Was already up-to-date. */
+ ERROR, /* An error occurred while being made (compat mode only) */
+ ABORTED /* An error occurred making an inferior (compat) */
+};
+
/*-
* The structure for an individual graph node. Each node has several
* pieces of data associated with it.
@@ -146,23 +160,8 @@ typedef struct GNode {
#define DONE_ALLSRC 0x40 /* We do it once only */
#define CYCLE 0x1000 /* Used by MakePrintStatus */
#define DONECYCLE 0x2000 /* Used by MakePrintStatus */
- enum enum_made {
- UNMADE, DEFERRED, REQUESTED, BEINGMADE,
- MADE, UPTODATE, ERROR, ABORTED
- } made; /* Set to reflect the state of processing
- * on this node:
- * UNMADE - Not examined yet
- * DEFERRED - Examined once (building child)
- * REQUESTED - on toBeMade list
- * BEINGMADE - Target is already being made.
- * Indicates a cycle in the graph.
- * MADE - Was out-of-date and has been made
- * UPTODATE - Was already up-to-date
- * ERROR - An error occurred while it was being
- * made (used only in compat mode)
- * ABORTED - The target was aborted due to
- * an error making an inferior (compat).
- */
+ enum enum_made made; /* Set to reflect the state of processing
+ * on this node */
int unmade; /* The number of unmade children */
time_t mtime; /* Its modification time */