--- stack/stack.h	2002/03/30 02:31:24	1.21
+++ stack/stack.h	2003/08/08 14:20:49	1.25
@@ -22,10 +22,48 @@
 
 #define HASHTBLSIZE 2048
 
+#define CAR(X) ((X)->content.c->car)
+#define CDR(X) ((X)->content.c->cdr)
+
+/* printf, sscanf, fgets, fprintf, fopen, perror */
+#include <stdio.h>
+/* exit, EXIT_SUCCESS, malloc, free */
+#include <stdlib.h>
+/* NULL */
+#include <stddef.h>
+/* dlopen, dlsym, dlerror */
+#include <dlfcn.h>
+/* strcmp, strcpy, strlen, strcat, strdup */
+#include <string.h>
+/* getopt, STDIN_FILENO, STDOUT_FILENO, usleep */
+#include <unistd.h>
+/* EX_NOINPUT, EX_USAGE */
+#include <sysexits.h>
+/* assert */
+#include <assert.h>
+/* waitpid */
+#include <sys/wait.h>
+
+#ifdef __linux__
+/* mtrace, muntrace */
+#include <mcheck.h>
+/* ioctl */
+#include <sys/ioctl.h>
+/* KDMKTONE */
+#include <linux/kd.h>
+#endif /* __linux__ */
+
+
+
 /* First, define some types. */
 
 struct cons_struct;
 struct symbol_struct;
+struct environment_struct;
+
+/* A type for pointers to external functions */
+typedef void (*funcp)(struct environment_struct*); 
+/* funcp is a pointer to a void function (environment *) */
 
 /* A value of some type */
 typedef struct {
@@ -55,6 +93,8 @@
     FILE *p;			/* ...or an I/O stream */
     int i;			/* ...or an integer */
     float f;			/* ...or a floating point number */
+    funcp func;                 /* ...or a function pointer */
+    char *string;               /* ...or a string */
   } content;			/* Stores a pointer or an integer */
 
 } value;
@@ -102,9 +142,6 @@
   int gc_count;			/* Amount currently allocated */
 } environment;
 
-/* A type for pointers to external functions */
-typedef void (*funcp)(environment*); /* funcp is a pointer to a void
-					 function (environment *) */
 
 void init_env(environment*);
 void printerr(const char*);