2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d2e48709b0..dae88397ce0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * bytecode.c (Fbyte_code) [!defined BYTE_CODE_SAFE]: Remove var
+        that is set but not used.
+
         * print.c (print_object): Remove var that is set but not used.
 
         Replace 2 copies of readlink code with 1 gnulib version (Bug#8401).
diff --git a/src/bytecode.c b/src/bytecode.c
index a7be8e26f27..5a62c913a40 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -425,8 +425,8 @@ If the third argument is incorrect, Emacs may crash.  */)
 #ifdef BYTE_CODE_SAFE
   int const_length = XVECTOR (vector)->size;
   Lisp_Object *stacke;
-#endif
   int bytestr_length;
+#endif
   struct byte_stack stack;
   Lisp_Object *top;
   Lisp_Object result;
@@ -453,7 +453,9 @@ If the third argument is incorrect, Emacs may crash.  */)
        convert them back to the originally intended unibyte form.  */
     bytestr = Fstring_as_unibyte (bytestr);
 
+#ifdef BYTE_CODE_SAFE
   bytestr_length = SBYTES (bytestr);
+#endif
   vectorp = XVECTOR (vector)->contents;
 
   stack.byte_string = bytestr;