* emacsclient.c (main): Avoid having a declaration after a

statement.

* sysdep.c: Comment out text after #endif.

2 files changed, 6 insertions, 1 deletions

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index 6812eeef847..dcd1713294c 100644
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -1,3 +1,8 @@
+2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacsclient.c (main): Avoid having a declaration after a
+        statement. 
+
 2007-05-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacsclient.c (print_help_and_exit): Restore and adapt trunk
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0356735ab6d..0dc662dabef 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1347,11 +1347,11 @@ main (argc, argv)
 
   if (tty)
     {
+      char *type = getenv ("TERM");
       char *tty_name = NULL;
 #ifndef WINDOWSNT
       tty_name = ttyname (fileno (stdin));
 #endif
-      char *type = getenv ("TERM");
 
       if (! tty_name)
         {