Move config.h up in include lists and remove actual_x inline tag

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

diff --git a/ChangeLog b/ChangeLog
index ba853fc51aacb48d653b1b2f6d24e769bb5e9a52..ca88a0476a4dcc9b0215c95317ed16d19ade4e5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,8 @@ Cvs code -
          and change the aproproate calls which used nmalloc for lack of
          an apropriate calloc function *** FIXME ***
        - After "Alternate" spell checker is called, cursor is repositioned on
-         the same line as before ^T was called.
+         the same line as before ^T was called. 
+       - Moved config.h up in all .c files #include list (Albert Chin).
 - configure.in:
        - New option, --enable-nanorc which allows people to have a .nanorc
          initialization file and set options normally used on the command
@@ -45,6 +46,9 @@ Cvs code -
   do_replace()
        - If we manage to make it in somehow with VIEW_MODE on, abort
          nicely (fixes BUG #59).
+- winio.c:
+  actual_x()
+       - Remove inline from function decl (Albert Chin).
 
 nano 1.1 tree forked here 04/07/2001
 

diff --git a/cut.c b/cut.c
index 5e8cba7569e01ced4d6df49a475e2fbdfed9b0ec..eff32e3953e70e43ee6c43c947a24a6f0e8cca60 100644 (file)
--- a/cut.c
+++ b/cut.c
@@ -19,10 +19,11 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 

diff --git a/files.c b/files.c
index 77970c4e62aa17a749cc5eeed5f5a904ae60bd91..878e784bb162ad395d12dc9c901014c40dbb1ad7 100644 (file)
--- a/files.c
+++ b/files.c
@@ -19,6 +19,8 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -31,7 +33,6 @@
 #include <dirent.h>
 #include <pwd.h>
 
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 

diff --git a/global.c b/global.c
index cb04e7500f85dd32a599c4bff9043d30761034c9..80ac83a501982325d78e7f65443db4edc83350e3 100644 (file)
--- a/global.c
+++ b/global.c
@@ -19,8 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include <sys/stat.h>
 #include "config.h"
+
+#include <sys/stat.h>
 #include "nano.h"
 #include "proto.h"
 

diff --git a/move.c b/move.c
index bda2c3c84573dd37755a30bdf83a89f16bb6d656..f7a9efa85b198ed2a6474cfd0412140f9ddc7743 100644 (file)
--- a/move.c
+++ b/move.c
@@ -19,10 +19,11 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 

diff --git a/nano.c b/nano.c
index 809d7f6bb9abab88aada4fdb18be4637a37f6b03..86d8c40ac4b554f7eb10fcfdd2e9a9597e589637 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -19,6 +19,8 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -38,7 +40,6 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 

diff --git a/search.c b/search.c
index 7e04041ae83628f807781d6c77642dc0cd55fd2f..ed63146c446d2cdedecb88f8b18f261a81610b2c 100644 (file)
--- a/search.c
+++ b/search.c
@@ -19,12 +19,13 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 

diff --git a/utils.c b/utils.c
index 1ce844cc77cbc9262977bc029153472d5b6e0c00..d0298ccc8a8a49383de09096ce730e3ad20462f5 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -19,12 +19,13 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#include "config.h"
 #include "nano.h"
 #include "proto.h"
 

diff --git a/winio.c b/winio.c
index 6405adcc5936995da7e25515c7e071abe18a434d..0ca40bee213406b456edd16cc9d02b61745f8690 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -19,11 +19,12 @@
  *                                                                        *
  **************************************************************************/
 
+#include "config.h"
+
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "config.h"
 #include "proto.h"
 #include "nano.h"
 
@@ -127,7 +128,7 @@ int actual_x_from_start(filestruct * fileptr, int xplus, int start)
 }
 
 /* Opposite of xplustabs */
-inline int actual_x(filestruct * fileptr, int xplus)
+int actual_x(filestruct * fileptr, int xplus)
 {
     return actual_x_from_start(fileptr, xplus, 0);
 }