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

since proto.h includes nano.h, and nano.h includes config.h first, 

include proto.h first and remove redundant includes of config.h in all
non-header source files


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3236 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-12-08 02:47:10 +00:00
parent 8befda6490
commit 034b994eb5
16 changed files with 21 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -124,6 +124,9 @@ CVS code -
problems with its being defined as the wrong type aren't
nano's fault. Changes to handle_hupterm(), do_suspend(),
do_continue(), handle_sigwinch(), and cancel_command(). (DLR)
- Since proto.h includes nano.h, and nano.h includes config.h
first, include proto.h first and remove redundant includes of
config.h in all non-header source files. (DLR)
- browser.c:
do_browser()
- When setting the width of each file, use the "?" operator

5
src/browser.c
View File

@ -21,15 +21,12 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include "proto.h"
#ifndef DISABLE_BROWSER

5
src/chars.c
View File

@ -21,13 +21,10 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <string.h>
#include <ctype.h>
#include "proto.h"
#ifdef ENABLE_UTF8
#ifdef HAVE_WCHAR_H

5
src/color.c
View File

@ -21,13 +21,10 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <string.h>
#include "proto.h"
#ifdef ENABLE_COLOR

5
src/cut.c
View File

@ -21,13 +21,10 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <string.h>
#include <stdio.h>
#include "proto.h"
static bool keep_cutbuffer = FALSE;
/* Should we keep the contents of the cutbuffer? */

5
src/files.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <string.h>
@ -33,7 +31,6 @@
#include <errno.h>
#include <ctype.h>
#include <pwd.h>
#include "proto.h"
/* Add an entry to the openfile openfilestruct. This should only be
* called from open_buffer(). */

4
src/global.c
View File

@ -21,10 +21,6 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
/* Global variables */

5
src/help.c
View File

@ -21,14 +21,11 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "proto.h"
#ifndef DISABLE_HELP

5
src/move.c
View File

@ -21,13 +21,10 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <string.h>
#include <ctype.h>
#include "proto.h"
void do_first_line(void)
{

13
src/nano.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <stdarg.h>
@ -36,16 +34,15 @@
#include <errno.h>
#include <ctype.h>
#include <locale.h>
#include "proto.h"
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#ifndef NANO_TINY
#include <setjmp.h>
#endif

5
src/prompt.c
View File

@ -21,14 +21,11 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include "proto.h"
static char *prompt = NULL;
/* The prompt string for statusbar

5
src/rcfile.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdarg.h>
#include <string.h>
@ -31,7 +29,6 @@
#include <errno.h>
#include <unistd.h>
#include <ctype.h>
#include "proto.h"
#ifdef ENABLE_NANORC

5
src/search.c
View File

@ -21,16 +21,13 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#include "proto.h"
static bool search_last_line = FALSE;
/* Have we gone past the last line while searching? */

5
src/text.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <signal.h>
@ -32,7 +30,6 @@
#include <fcntl.h>
#include <sys/wait.h>
#include <errno.h>
#include "proto.h"
#ifndef NANO_TINY
static pid_t pid = -1;

5
src/utils.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <string.h>
#include <stdio.h>
@ -31,7 +29,6 @@
#include <pwd.h>
#include <ctype.h>
#include <errno.h>
#include "proto.h"
int digits(size_t n)
{

5
src/winio.c
View File

@ -21,9 +21,7 @@
* *
**************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "proto.h"
#include <stdio.h>
#include <stdarg.h>
@ -31,7 +29,6 @@
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include "proto.h"
static int *key_buffer = NULL;
/* The default keystroke buffer,