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

Fixes to includes of make_malloc.h to that it actually builds when 

USE_EMALLOC is undefined.
Fixes earlier fixes :-)
This commit is contained in:
dsl 2009-01-24 14:43:28 +00:00
parent 7c83fa3718
commit 97347d2cbb
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/lst.lib/lstInt.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lstInt.h,v 1.19 2009/01/24 11:59:39 dsl Exp $ */
/* $NetBSD: lstInt.h,v 1.20 2009/01/24 14:43:29 dsl Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -41,8 +41,8 @@
#ifndef _LSTINT_H_
#define _LSTINT_H_
#include "../make_malloc.h"
#include "../lst.h"
#include "../make_malloc.h"
typedef struct ListNode {
struct ListNode *prevPtr; /* previous element in list */

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

@ -1,4 +1,4 @@
/* $NetBSD: make.h,v 1.77 2009/01/24 11:59:39 dsl Exp $ */
/* $NetBSD: make.h,v 1.78 2009/01/24 14:43:28 dsl Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -116,6 +116,7 @@
#include "hash.h"
#include "config.h"
#include "buf.h"
#include "make_malloc.h"
/*-
* The structure for an individual graph node. Each node has several
@ -429,7 +430,6 @@ extern int debug;
#define DEBUG(module) (debug & CONCAT(DEBUG_,module))
#include "nonints.h"
#include "make_malloc.h"
int Make_TimeStamp(GNode *, GNode *);
Boolean Make_OODate(GNode *);

11
usr.bin/make/make_malloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: make_malloc.c,v 1.2 2009/01/24 13:06:16 cegger Exp $ */
/* $NetBSD: make_malloc.c,v 1.3 2009/01/24 14:43:28 dsl Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -27,14 +27,15 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: make_malloc.c,v 1.2 2009/01/24 13:06:16 cegger Exp $");
__RCSID("$NetBSD: make_malloc.c,v 1.3 2009/01/24 14:43:28 dsl Exp $");
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "make_malloc.h"
#ifndef USE_EMALLOC
/*
* enomem --
@ -43,7 +44,9 @@ __RCSID("$NetBSD: make_malloc.c,v 1.2 2009/01/24 13:06:16 cegger Exp $");
static void
enomem(void)
{
(void)fprintf(stderr, "%s.\n", strerror(errno));
extern char *progname;
(void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno));
exit(2);
}

4
usr.bin/make/make_malloc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: make_malloc.h,v 1.3 2009/01/24 13:06:16 cegger Exp $ */
/* $NetBSD: make_malloc.h,v 1.4 2009/01/24 14:43:29 dsl Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -27,8 +27,6 @@
*/
#ifndef USE_EMALLOC
#include <sys/types.h>
void *bmake_malloc(size_t);
void *bmake_realloc(void *, size_t);
char *bmake_strdup(const char *);