--- a/lwlib/lw_expr.c	Fri Mar 19 10:03:56 2010 +0000
+++ b/lwlib/lw_expr.c	Wed Mar 24 21:30:31 2010 -0600
@@ -31,15 +31,15 @@
 #include "lw_error.h"
 #include "lw_string.h"
 
-static lw_expr_t (*evaluate_special)(int t, void *ptr) = NULL;
-static lw_expr_t (*evaluate_var)(char *var) = NULL;
+static lw_expr_fn_t *evaluate_special = NULL;
+static lw_expr_fn2_t *evaluate_var = NULL;
 
-void lw_expr_set_special_handler(lw_expr_t (*fn)(int t, void *ptr))
+void lw_expr_set_special_handler(lw_expr_fn_t *fn)
 {
 	evaluate_special = fn;
 }
 
-void lw_expr_set_var_handler(lw_expr_t (*fn)(char *var))
+void lw_expr_set_var_handler(lw_expr_fn2_t *fn)
 {
 	evaluate_var = fn;
 }