--- ray/src/util/eplus_adduvf.c	2014/02/27 22:42:53	2.14
+++ ray/src/util/eplus_adduvf.c	2014/03/03 17:51:50	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: eplus_adduvf.c,v 2.14 2014/02/27 22:42:53 greg Exp $";
+static const char RCSid[] = "$Id: eplus_adduvf.c,v 2.16 2014/03/03 17:51:50 greg Exp $";
 #endif
 /*
  * Add User View Factors to EnergyPlus Input Data File
@@ -176,7 +176,7 @@ add_subsurf(IDF_OBJECT *param)
 static IDF_FIELD *
 get_vlist(IDF_OBJECT *param, const char *zname)
 {
-	static const int	itm_len = sizeof(IDF_FIELD)+6;
+#define	itm_len		(sizeof(IDF_FIELD)+6)
 	static char		fld_buf[4*itm_len];
 	static char		*next_fbp = fld_buf;
 	int			i;
@@ -219,6 +219,7 @@ get_vlist(IDF_OBJECT *param, const char *zname)
 		sprintf(res->val, "%d", i/3);
 	}
 	return(res);
+#undef itm_len
 }
 
 /* Get/allocate surface polygon */
@@ -361,7 +362,7 @@ start_rcontrib(SUBPROC *pd, ZONE *zp)
 	IDF_FIELD	*fptr;
 	int		i, j, n;
 						/* start oconv command */
-	sprintf(cbuf, "oconv - > '%s'", temp_octree);
+	sprintf(cbuf, "oconv - > \"%s\"", temp_octree);
 	if ((ofp = popen(cbuf, "w")) == NULL) {
 		fputs(progname, stderr);
 		fputs(": cannot open oconv process\n", stderr);