ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Chris Allegretta 2009-02-01 00:04:42 +00:00
parent 61f5c55f7b
commit ecc245ccca
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.c
View File

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

19
src/utils.c
View File

@ -183,14 +183,7 @@ void sunder(char *str)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301, USA. */ * 02110-1301, USA. */
#if !defined(NANO_TINY) && defined(ENABLE_NANORC) #ifdef 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
#ifndef HAVE_GETDELIM #ifndef HAVE_GETDELIM
/* This function is equivalent to 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; return (c == EOF && (indx - 1) == 0) ? -1 : indx - 1;
} }
#endif #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 #ifdef HAVE_REGEX_H
/* Do the compiled regex in preg and the regex in string match the /* Do the compiled regex in preg and the regex in string match the