Module Name: othersrc
Committed By: dholland
Date: Sat Mar 23 22:40:37 UTC 2013
Modified Files:
othersrc/usr.bin/dholland-make2: dir.c dir.h graph.h make.c
Log Message:
Fix inlining again, more forcibly this time.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/dholland-make2/dir.c \
othersrc/usr.bin/dholland-make2/graph.h
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/dholland-make2/dir.h
cvs rdiff -u -r1.14 -r1.15 othersrc/usr.bin/dholland-make2/make.c
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/dir.c
diff -u othersrc/usr.bin/dholland-make2/dir.c:1.7 othersrc/usr.bin/dholland-make2/dir.c:1.8
--- othersrc/usr.bin/dholland-make2/dir.c:1.7 Sat Mar 23 22:03:11 2013
+++ othersrc/usr.bin/dholland-make2/dir.c Sat Mar 23 22:40:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.7 2013/03/23 22:03:11 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.8 2013/03/23 22:40:36 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -133,11 +133,13 @@
#include <errno.h>
#include <stdio.h>
+#define DIRINLINE /* empty */
+
#include "make.h"
#include "hash.h"
#include "dir.h"
-__RCSID("$NetBSD: dir.c,v 1.7 2013/03/23 22:03:11 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.8 2013/03/23 22:40:36 dholland Exp $");
/*
* A search path consists of a list of Path structures. A Path structure
Index: othersrc/usr.bin/dholland-make2/graph.h
diff -u othersrc/usr.bin/dholland-make2/graph.h:1.7 othersrc/usr.bin/dholland-make2/graph.h:1.8
--- othersrc/usr.bin/dholland-make2/graph.h:1.7 Sat Mar 23 17:09:40 2013
+++ othersrc/usr.bin/dholland-make2/graph.h Sat Mar 23 22:40:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: graph.h,v 1.7 2013/03/23 17:09:40 dholland Exp $ */
+/* $NetBSD: graph.h,v 1.8 2013/03/23 22:40:36 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -77,13 +77,17 @@
#include "array.h"
+#ifndef GRAPHINLINE
+#define GRAPHINLINE MAKE_INLINE
+#endif
+
/*
* Array of gnodes - the type will be "GList" and the operations will
* be glist_create(), glist_add(), etc.
*/
struct GNode;
-DECLARRAY_BYTYPE(glist, struct GNode, MAKE_INLINE);
-DEFARRAY_BYTYPE(glist, struct GNode, MAKE_INLINE);
+DECLARRAY_BYTYPE(glist, struct GNode, GRAPHINLINE);
+DEFARRAY_BYTYPE(glist, struct GNode, GRAPHINLINE);
typedef struct glist GList;
/*
Index: othersrc/usr.bin/dholland-make2/dir.h
diff -u othersrc/usr.bin/dholland-make2/dir.h:1.4 othersrc/usr.bin/dholland-make2/dir.h:1.5
--- othersrc/usr.bin/dholland-make2/dir.h:1.4 Sat Mar 23 22:03:11 2013
+++ othersrc/usr.bin/dholland-make2/dir.h Sat Mar 23 22:40:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.h,v 1.4 2013/03/23 22:03:11 dholland Exp $ */
+/* $NetBSD: dir.h,v 1.5 2013/03/23 22:40:36 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -80,6 +80,10 @@
#include "array.h"
+#ifndef DIRINLINE
+#define DIRINLINE MAKE_INLINE
+#endif
+
typedef struct Path {
char *name; /* Name of directory */
int refCount; /* Number of paths with this directory */
@@ -89,11 +93,11 @@ typedef struct Path {
} Path;
/* struct patharray -> array of Path */
-DECLARRAY_BYTYPE(patharray, struct Path, MAKE_INLINE);
-DEFARRAY_BYTYPE(patharray, struct Path, MAKE_INLINE);
+DECLARRAY_BYTYPE(patharray, struct Path, DIRINLINE);
+DEFARRAY_BYTYPE(patharray, struct Path, DIRINLINE);
/* struct patharrayarray -> array of patharray (used in parse.c) */
-DECLARRAY(patharray, MAKE_INLINE);
-DEFARRAY(patharray, MAKE_INLINE);
+DECLARRAY(patharray, DIRINLINE);
+DEFARRAY(patharray, DIRINLINE);
void Dir_Init(const char *);
void Dir_InitCur(const char *);
Index: othersrc/usr.bin/dholland-make2/make.c
diff -u othersrc/usr.bin/dholland-make2/make.c:1.14 othersrc/usr.bin/dholland-make2/make.c:1.15
--- othersrc/usr.bin/dholland-make2/make.c:1.14 Sat Mar 23 22:17:51 2013
+++ othersrc/usr.bin/dholland-make2/make.c Sat Mar 23 22:40:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.14 2013/03/23 22:17:51 dholland Exp $ */
+/* $NetBSD: make.c,v 1.15 2013/03/23 22:40:36 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,12 +106,14 @@
* Make_ExpandUse Expand .USE nodes
*/
+#define GRAPHINLINE /* empty */
+
#include "make.h"
#include "hash.h"
#include "dir.h"
#include "job.h"
-MAKE_RCSID("$NetBSD: make.c,v 1.14 2013/03/23 22:17:51 dholland Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.15 2013/03/23 22:40:36 dholland Exp $");
typedef struct {
GList nodes;
