Fixing compilation with --enable-tiny plus --enable-nanorc.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5133 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index a863744eeb418739987f9aee65e7d637411418ae..f4dd3d23d5d89760f76d3c7947701b06e9f488a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-08  Benno Schulenberg  <bensberg@justemail.net>
+       * src/proto.h, src/nano.c: Fix compilation with --enable-tiny plus
+       --enable-nanorc.
+
 2015-03-07  Benno Schulenberg  <bensberg@justemail.net>
        * doc/man/nanorc.5, doc/texinfo/nano.texi: Add a note about the
        inherent imperfection of using regular expressions for syntax

diff --git a/src/nano.c b/src/nano.c
index da4e78c7469050147e8d35c2aff7194e5b56be26..b5c8cba784a91d3888b50bc2843b3143e10a6e5e 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1482,13 +1482,13 @@ void do_toggle(int flag)
     desc = (char *) _(flagtostr(flag));
     statusbar("%s %s", desc, enabled ? _("enabled") : _("disabled"));
 }
+#endif /* !NANO_TINY */
 
 /* Bleh. */
 void do_toggle_void(void)
 {
     ;
 }
-#endif /* !NANO_TINY */
 
 /* Disable extended input and output processing in our terminal
  * settings. */

diff --git a/src/proto.h b/src/proto.h
index 46b0be49009d383a2b19f01656f0ec8caa5fdc90..9199ac04935e2007ce509906922bbd0c5b64e423 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -480,8 +480,8 @@ RETSIGTYPE do_continue(int signal);
 RETSIGTYPE handle_sigwinch(int signal);
 void allow_pending_sigwinch(bool allow);
 void do_toggle(int flag);
-void do_toggle_void(void);
 #endif
+void do_toggle_void(void);
 void disable_extended_io(void);
 #ifdef USE_SLANG
 void disable_signals(void);