--- ray/src/common/calcomp.h	2003/06/27 06:53:21	2.11
+++ ray/src/common/calcomp.h	2003/08/04 19:20:26	2.15
@@ -1,15 +1,16 @@
-/* RCSid $Id: calcomp.h,v 2.11 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: calcomp.h,v 2.15 2003/08/04 19:20:26 greg Exp $ */
 /*
  *  calcomp.h - header file for expression parser.
  */
 #ifndef _RAD_CALCOMP_H_
 #define _RAD_CALCOMP_H_
+
+#include <stdio.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-
 #define	 VAR		1
 #define	 NUM		2
 #define	 UMINUS		3
@@ -48,7 +49,7 @@ typedef struct epnode {
 
 typedef struct vardef  VARDEF;	/* a variable definition */
 
-#define	 MAXWORD	127		/* maximum word/id length */
+#define	 RMAXWORD	127		/* maximum word/id length */
 #define	 CNTXMARK	'`'		/* context mark */
 
 #define	 isid(c)	(isalnum(c) || (c) == '_' || \
@@ -64,12 +65,15 @@ typedef struct vardef  VARDEF;	/* a variable definitio
 #define  E_RCONST	020
 #define  E_REDEFW	040
 
-extern double  (*eoper[])();
+extern double  (*eoper[])(EPNODE *);
 extern unsigned long  eclock;
 extern unsigned int  esupport;
 extern EPNODE	*curfunc;
 extern int  nextc;
 
+					/* defined in biggerlib.c */
+extern void biggerlib(void);
+
 					/* defined in caldefn.c */
 extern void	fcompile(char *fname);
 extern void	scompile(char *str, char *fname, int ln);
@@ -95,9 +99,9 @@ extern EPNODE	*dnext(void);
 extern EPNODE	*dpop(char *name);
 extern void	dpush(char *nm, EPNODE *ep);
 extern void	addchan(EPNODE *sp);
-extern void	getstatement();
-extern EPNODE	*getdefn();
-extern EPNODE	*getchan();
+extern void	getstatement(void);
+extern EPNODE	*getdefn(void);
+extern EPNODE	*getchan(void);
 					/* defined in calexpr.c */
 extern EPNODE	*eparse(char *expr);
 extern double	eval(char *expr);
@@ -146,10 +150,6 @@ extern char	*emalloc(unsigned int n);
 extern char	*ecalloc(unsigned int ne, unsigned int es);
 extern char	*erealloc(char *cp, unsigned int n);
 extern void	efree(char *cp);
-					/* miscellaneous */
-extern void	eputs(char *s);
-extern void	wputs(char *s);
-extern void	quit(int code);
 					/* defined by client */
 extern double	chanvalue(int n);