===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/gnode.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/make/gnode.h	2008/11/04 07:22:35	1.14
--- src/usr.bin/make/gnode.h	2009/08/16 09:51:12	1.15
***************
*** 1,7 ****
  #ifndef GNODE_H
  #define GNODE_H
  /*	$OpenPackages$ */
! /*	$OpenBSD: gnode.h,v 1.14 2008/11/04 07:22:35 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
--- 1,7 ----
  #ifndef GNODE_H
  #define GNODE_H
  /*	$OpenPackages$ */
! /*	$OpenBSD: gnode.h,v 1.15 2009/08/16 09:51:12 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
***************
*** 71,92 ****
  #define UNKNOWN		0
  #define BEINGMADE	1
  #define MADE		2
! #define	UPTODATE	3
  #define ERROR		4
  #define ABORTED		5
  #define CYCLE		6
  #define ENDCYCLE	7
  #define NOSUCHNODE	8
  
! #define SPECIAL_NONE	0
! #define	SPECIAL_PATH		21
! #define SPECIAL_MASK		63
! #define SPECIAL_TARGET		64
! #define SPECIAL_SOURCE		128
  #define SPECIAL_TARGETSOURCE	(SPECIAL_TARGET|SPECIAL_SOURCE)
  
  struct GNode_ {
!     int special_op;	/* special op to apply */
      unsigned char special;/* type of special node */
      char must_make;	/* true if this target needs to be remade */
      char childMade;	/* true if one of this target's children was
--- 71,92 ----
  #define UNKNOWN		0
  #define BEINGMADE	1
  #define MADE		2
! #define UPTODATE	3
  #define ERROR		4
  #define ABORTED		5
  #define CYCLE		6
  #define ENDCYCLE	7
  #define NOSUCHNODE	8
  
! #define SPECIAL_NONE	0U
! #define SPECIAL_PATH		21U
! #define SPECIAL_MASK		63U
! #define SPECIAL_TARGET		64U
! #define SPECIAL_SOURCE		128U
  #define SPECIAL_TARGETSOURCE	(SPECIAL_TARGET|SPECIAL_SOURCE)
  
  struct GNode_ {
!     unsigned int special_op;	/* special op to apply */
      unsigned char special;/* type of special node */
      char must_make;	/* true if this target needs to be remade */
      char childMade;	/* true if one of this target's children was
***************
*** 111,117 ****
  			 */
      char build_lock;	/* for parallel build in siblings */
      char *path;		/* The full pathname of the file */
!     unsigned int type;		/* Its type (see the OP flags, below) */
      int order;		/* Its wait weight */
  
      int unmade;		/* The number of unmade children */
--- 111,117 ----
  			 */
      char build_lock;	/* for parallel build in siblings */
      char *path;		/* The full pathname of the file */
!     unsigned int type;	/* Its type (see the OP flags, below) */
      int order;		/* Its wait weight */
  
      int unmade;		/* The number of unmade children */