Fix comiplation issues with --enable-tiny --enable-nanorc (?!)

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

diff --git a/src/nano.c b/src/nano.c
index 5f71c87605e97c413ee20bb937416a9bb3d716c7..cdf302e9c6698c18909db9c5975543f9b61ac220 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1083,7 +1083,9 @@ void stdin_pager(void)
     /* Set things up so that Ctrl-C will cancel the new process. */
     /* Enable interpretation of the special control keys so that we get
      * SIGINT when Ctrl-C is pressed. */
+#ifndef NANO_TINY
     enable_signals();
+#endif
 
     if (sigaction(SIGINT, NULL, &pager_newaction) == -1) {
        pager_sig_failed = TRUE;

diff --git a/src/utils.c b/src/utils.c
index 339b4d7413324da4fedb2f91880260682f535862..4ccfc95566c1dbc93b32e439c8cacfe090476588 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -183,14 +183,7 @@ void sunder(char *str)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301, USA. */
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
-#ifndef HAVE_GETLINE
-/* This function is equivalent to getline(). */
-ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
-{
-    return getdelim(lineptr, n, '\n', stream);
-}
-#endif
+#ifdef ENABLE_NANORC
 
 #ifndef HAVE_GETDELIM
 /* This function is equivalent to getdelim(). */
@@ -242,7 +235,15 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
     return (c == EOF && (indx - 1) == 0) ? -1 : indx - 1;
 }
 #endif
-#endif /* !NANO_TINY && ENABLE_NANORC */
+
+#ifndef HAVE_GETLINE
+/* This function is equivalent to getline(). */
+ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
+{
+    return getdelim(lineptr, n, '\n', stream);
+}
+#endif
+#endif /* ENABLE_NANORC */
 
 #ifdef HAVE_REGEX_H
 /* Do the compiled regex in preg and the regex in string match the