From 93f2a6d691e4f9c019fcfb27693c5ea399ef2ac9 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Sun, 19 May 2013 08:43:30 +0800
Subject: [PATCH] clean up line dependencies.

---
 estruct.h |  4 ++++
 line.h    | 36 ++++++++++++++++++------------------
 utf8.h    |  7 ++++---
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/estruct.h b/estruct.h
index af27316..74acaca 100644
--- a/estruct.h
+++ b/estruct.h
@@ -11,6 +11,10 @@
  *	modified by Petri Kutvonen
  */
 
+
+#include "line.h"
+
+
 #define MAXCOL	500
 #define MAXROW	500
 
diff --git a/line.h b/line.h
index 7b07a3b..2294b14 100644
--- a/line.h
+++ b/line.h
@@ -25,23 +25,23 @@ struct line {
 #define lputc(lp, n, c) ((lp)->l_text[(n)]=(c))
 #define llength(lp)     ((lp)->l_used)
 
-extern void lfree(struct line *lp);
-extern void lchange(int flag);
-extern int insspace(int f, int n);
-extern int linstr(char *instr);
-extern int linsert(int n, int c);
-extern int lowrite(int c);
-extern int lover(char *ostr);
-extern int lnewline(void);
-extern int ldelete(long n, int kflag);
-extern int ldelchar(long n, int kflag);
-extern int lgetchar(unicode_t *);
-extern char *getctext(void);
-extern int putctext(char *iline);
-extern int ldelnewline(void);
-extern void kdelete(void);
-extern int kinsert(int c);
-extern int yank(int f, int n);
-extern struct line *lalloc(int);  /* Allocate a line. */
+void lfree( struct line *lp) ;
+void lchange( int flag) ;
+int insspace( int f, int n) ;
+int linstr( char *instr) ;
+int linsert( int n, int c) ;
+int lowrite( int c) ;
+int lover( char *ostr) ;
+int lnewline( void) ;
+int ldelete( long n, int kflag) ;
+int ldelchar( long n, int kflag) ;
+int lgetchar( unicode_t *) ;
+char *getctext( void) ;
+int putctext( char *iline) ;
+int ldelnewline( void) ;
+void kdelete( void) ;
+int kinsert( int c) ;
+int yank( int f, int n) ;
+struct line *lalloc( int) ;  /* Allocate a line. */
 
 #endif  /* LINE_H_ */
diff --git a/utf8.h b/utf8.h
index c317a6a..1a6f274 100644
--- a/utf8.h
+++ b/utf8.h
@@ -3,10 +3,11 @@
 
 typedef unsigned int unicode_t;
 
-unsigned utf8_to_unicode(char *line, unsigned index, unsigned len, unicode_t *res);
-unsigned unicode_to_utf8(unsigned int c, char *utf8);
+unsigned utf8_to_unicode( char *line, unsigned index, unsigned len,
+															unicode_t *res) ;
+unsigned unicode_to_utf8( unsigned int c, char *utf8) ;
 
-static inline int is_beginning_utf8(unsigned char c)
+static inline int is_beginning_utf8( unsigned char c)
 {
 	return (c & 0xc0) != 0x80;
 }