--- rxvt-unicode/src/rxvtd.C	2010/11/19 00:10:18	1.53
+++ rxvt-unicode/src/rxvtd.C	2011/02/21 07:41:02	1.56
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
 
-  unlink (rxvt_connection::unix_sockname ());
+  unlink (sockname);
 
   mode_t omask = umask (0077);
 
@@ -229,9 +229,9 @@
 {
   ptytty::init ();
 
-  int opt_fork = 0, opt_opendisplay = 0, opt_quiet = 0;
+  static char opt_fork, opt_opendisplay, opt_quiet;
 #if ENABLE_MLOCK
-  int opt_lock = 0;
+  static char opt_lock;
 #endif
 
   for (int i = 1; i < argc; i++)