--- rxvt-unicode/src/rxvt.h	2006/01/11 05:29:40	1.197
+++ rxvt-unicode/src/rxvt.h	2006/01/12 01:30:53	1.199
@@ -115,6 +115,24 @@
 void             rxvt_Draw_Triangle               (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
 void             rxvt_usleep                      (int usecs);
 
+/////////////////////////////////////////////////////////////////////////////
+
+// temporarily replace the process environment
+extern char **environ;
+extern char **rxvt_environ; // the original environ pointer
+
+inline void set_environ (stringvec *envv)
+{
+  if (envv)
+    environ = (char **)envv->begin ();
+}
+
+inline void set_environ (char **envv)
+{
+  if (envv)
+    environ = envv;
+}
+
 /*
  *****************************************************************************
  * STRUCTURES AND TYPEDEFS
@@ -700,8 +718,6 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define TEMP_ENV		temp_environ temp_environ (envv)
-
 #define OPTION(opt)		(options & (opt))
 #define DEFAULT_OPTIONS		(Opt_scrollBar | Opt_scrollTtyOutput \
 				 | Opt_jumpScroll | Opt_secondaryScreen \