From 38ac33a0d3c246f9c56bc095e73ad7612a5c0a3b Mon Sep 17 00:00:00 2001 From: Martin Stjernholm <mast@lysator.liu.se> Date: Fri, 14 Nov 2003 12:15:14 +0100 Subject: [PATCH] Did away with some dependencies on las.h. Rev: src/array.h:1.53 Rev: src/mapping.h:1.51 Rev: src/multiset.h:1.32 Rev: src/pike_types.h:1.92 Rev: src/svalue.h:1.126 --- src/array.h | 4 ++-- src/mapping.h | 4 ++-- src/multiset.h | 4 ++-- src/pike_types.h | 3 +-- src/svalue.h | 8 +++++++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/array.h b/src/array.h index 4337c356c0..393d506f41 100644 --- a/src/array.h +++ b/src/array.h @@ -2,13 +2,13 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: array.h,v 1.52 2003/04/28 18:32:38 mast Exp $ +|| $Id: array.h,v 1.53 2003/11/14 11:15:14 mast Exp $ */ #ifndef ARRAY_H #define ARRAY_H -#include "las.h" +#include "svalue.h" /* This debug tool writes out messages whenever arrays with unfinished * type fields are encountered. */ diff --git a/src/mapping.h b/src/mapping.h index 8c7dd52d4c..6bb6d9baf8 100644 --- a/src/mapping.h +++ b/src/mapping.h @@ -2,13 +2,13 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: mapping.h,v 1.50 2003/06/30 17:06:09 mast Exp $ +|| $Id: mapping.h,v 1.51 2003/11/14 11:15:14 mast Exp $ */ #ifndef MAPPING_H #define MAPPING_H -#include "las.h" +#include "svalue.h" #include "block_alloc_h.h" /* Compatible with PIKE_WEAK_INDICES and PIKE_WEAK_VALUES. */ diff --git a/src/multiset.h b/src/multiset.h index 84b0fa5706..b9922a99e9 100644 --- a/src/multiset.h +++ b/src/multiset.h @@ -2,7 +2,7 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: multiset.h,v 1.31 2003/01/11 00:01:20 mast Exp $ +|| $Id: multiset.h,v 1.32 2003/11/14 11:15:14 mast Exp $ */ #ifndef MULTISET_H @@ -437,7 +437,7 @@ void test_multiset (void); #else /* PIKE_NEW_MULTISETS */ -#include "las.h" +#include "svalue.h" struct multiset { diff --git a/src/pike_types.h b/src/pike_types.h index 5a9f4d3c46..e150818259 100644 --- a/src/pike_types.h +++ b/src/pike_types.h @@ -2,14 +2,13 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: pike_types.h,v 1.91 2003/11/14 00:28:38 mast Exp $ +|| $Id: pike_types.h,v 1.92 2003/11/14 11:15:14 mast Exp $ */ #ifndef PIKE_TYPES_H #define PIKE_TYPES_H #include "svalue.h" -#include "las.h" #define PIKE_TYPE_STACK_SIZE 100000 diff --git a/src/svalue.h b/src/svalue.h index 0b2e38dca1..cd21ff4a3a 100644 --- a/src/svalue.h +++ b/src/svalue.h @@ -2,7 +2,7 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: svalue.h,v 1.125 2003/11/04 18:16:40 grubba Exp $ +|| $Id: svalue.h,v 1.126 2003/11/14 11:15:14 mast Exp $ */ #ifndef SVALUE_H @@ -45,6 +45,12 @@ struct pike_string; struct callable; #endif +#ifndef STRUCT_NODE_S_DECLARED +#define STRUCT_NODE_S_DECLARED +struct node_s; +typedef struct node_s node; +#endif + struct processing { struct processing *next; -- GitLab