From 6efda54a6c397bbdc71ae7afa42ff6f74e74d1c9 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Sat, 28 Apr 2001 18:03:52 +0000
Subject: [PATCH] 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
---
ChangeLog | 6 +++++-
cut.c | 3 ++-
files.c | 3 ++-
global.c | 3 ++-
move.c | 3 ++-
nano.c | 3 ++-
search.c | 3 ++-
utils.c | 3 ++-
winio.c | 5 +++--
9 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ba853fc5..ca88a047 100644
--- 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 5e8cba75..eff32e39 100644
--- 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 77970c4e..878e784b 100644
--- 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 cb04e750..80ac83a5 100644
--- 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 bda2c3c8..f7a9efa8 100644
--- 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 809d7f6b..86d8c40a 100644
--- 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 7e04041a..ed63146c 100644
--- 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 1ce844cc..d0298ccc 100644
--- 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 6405adcc..0ca40bee 100644
--- 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);
}
--
GitLab