[ViewVC] Diff of: cvs/cvsroot/rxvt-unicode/src/rxvt.h

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.537 by sf-exg, Fri Sep 5 19:02:53 2014 UTC vs.
Revision 1.538 by sf-exg, Mon Oct 6 11:11:19 2014 UTC

 /////////////////////////////////////////////////////////////////////////////
 // temporarily replace the process environment
 extern char **environ;
 extern char **rxvt_environ; // the original environ pointer
-static inline void
-set_environ (stringvec *envv)
-{
-#if ENABLE_PERL
-  assert (envv);
-#else
-  if (envv)
-#endif
-    environ = (char **)envv->begin ();
-}
 static inline void
 set_environ (char **envv)
 {
 #if ENABLE_PERL
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
   unsigned int    v_buflen;           /* size of area to write */
   stringvec      *argv, *envv;        /* if != 0, will be freed at destroy time */
+  char           **env;
 #ifdef KEYSYM_RESOURCE
   keyboard_manager *keyboard;
 #endif
 #ifndef NO_RESOURCES
   void pty_write ();
   void make_current () const // make this the "currently active" urxvt instance
   {
     SET_R (this);
-    set_environ (envv);
+    set_environ (env);
     rxvt_set_locale (locale);
   }
 #if USE_XIM
   rxvt_xim *input_method;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines