commit 034b994eb55006364c20b0baa0ad018b380ea2ef
parent 8befda6490c40a03270d08224d454a304741ce0d
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 8 Dec 2005 02:47:10 +0000
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
Diffstat:
16 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/src/browser.c b/src/browser.c
@@ -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
diff --git a/src/chars.c b/src/chars.c
@@ -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
diff --git a/src/color.c b/src/color.c
@@ -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
diff --git a/src/cut.c b/src/cut.c
@@ -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? */
diff --git a/src/files.c b/src/files.c
@@ -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(). */
diff --git a/src/global.c b/src/global.c
@@ -21,10 +21,6 @@
* *
**************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "proto.h"
/* Global variables */
diff --git a/src/help.c b/src/help.c
@@ -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
diff --git a/src/move.c b/src/move.c
@@ -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)
{
diff --git a/src/nano.c b/src/nano.c
@@ -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
diff --git a/src/prompt.c b/src/prompt.c
@@ -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
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -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
diff --git a/src/search.c b/src/search.c
@@ -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? */
diff --git a/src/text.c b/src/text.c
@@ -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;
diff --git a/src/utils.c b/src/utils.c
@@ -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)
{
diff --git a/src/winio.c b/src/winio.c
@@ -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,
