diff options
| author | Tim Vanderhoek <hoek@FreeBSD.org> | 1999-08-17 00:39:26 +0000 |
|---|---|---|
| committer | Tim Vanderhoek <hoek@FreeBSD.org> | 1999-08-17 00:39:26 +0000 |
| commit | 9bd2d6eee4d62856ab91eb90d01ccb4d2f0378b1 (patch) | |
| tree | c6625df65b5fe24c4dbad2e1b15bcd118c667517 /usr.bin/make/make.h | |
| parent | bfbacbd93f9abb30478bb3bcb36320d5b531c3d9 (diff) | |
Notes
Diffstat (limited to 'usr.bin/make/make.h')
| -rw-r--r-- | usr.bin/make/make.h | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index fad9a9ddd599..3845e7dafa0a 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)make.h 8.3 (Berkeley) 6/13/95 - * $Id: make.h,v 1.8 1998/11/14 16:15:04 dg Exp $ + * $Id: make.h,v 1.9 1999/07/31 20:53:02 hoek Exp $ */ /*- @@ -48,21 +48,32 @@ #define _MAKE_H_ #include <sys/types.h> +#include <sys/param.h> #include <stdio.h> #include <string.h> #include <ctype.h> -#if !defined(MAKE_BOOTSTRAP) && defined(BSD) -#include <sys/cdefs.h> -#else -#ifndef __P -#if defined(__STDC__) || defined(__cplusplus) -#define __P(protos) protos /* full-blown ANSI C */ + +#if !defined(MAKE_BOOTSTRAP) && defined(BSD4_4) +# include <sys/cdefs.h> #else -#define __P(protos) () /* traditional C preprocessor */ -#endif +# ifndef __P +# if defined(__STDC__) || defined(__cplusplus) +# define __P(protos) protos /* full-blown ANSI C */ +# else +# define __P(protos) () /* traditional C preprocessor */ +# endif +# endif +# ifndef __STDC__ +# ifndef const +# define const +# endif +# ifndef volatile +# define volatile +# endif +# endif #endif -#endif -#if __STDC__ + +#ifdef __STDC__ #include <stdlib.h> #include <unistd.h> #endif @@ -108,7 +119,7 @@ typedef struct GNode { Boolean make; /* TRUE if this target needs to be remade */ enum { UNMADE, BEINGMADE, MADE, UPTODATE, ERROR, ABORTED, - CYCLE, ENDCYCLE, + CYCLE, ENDCYCLE } made; /* Set to reflect the state of processing * on this node: * UNMADE - Not examined yet |