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

statement.

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

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index 6812eeef847e0beaa5c52c27595324a9b48e2ee0..dcd1713294cef6be04dca6e489adcbb1399ab6a7 100644 (file)
--- 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 0356735ab6d0d19d9128f796197149983cdf25db..0dc662dabef085f5d7e3e0def74bf7b6287950a3 100644 (file)
--- 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)
         {

diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty
index 94cf0cb50a76f42f19afdb01ddd734cc58eee94c..dd349cf9b240261b1236d61454239c1886b5244c 100644 (file)
--- a/src/ChangeLog.multi-tty
+++ b/src/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * sysdep.c: Comment out text after #endif.
+
 2007-05-20  L\e$,1 q\e(Brentey K\e,Aa\e(Broly  <lorentey@elte.hu>
 
        * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Revert to

diff --git a/src/sysdep.c b/src/sysdep.c
index ba55d2361bbe3af28774353d423eb7719e9ee71b..32efd7a056d64a30d84044575d1b60fdb94213ab 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2791,7 +2791,7 @@ sys_select (nfds, rfds, wfds, efds, timeout)
     }
   return ravail;
 }
-#endif not WINDOWSNT
+#endif /* not WINDOWSNT */
 
 /* Read keyboard input into the standard buffer,
    waiting for at least one character.  */