More build fixes, some code cleanup and untabify.

include/editline.h

@@ -4,8 +4,8 @@
 
 /* Assign these to get command completion, see cli.c for
  * example usage. */
-char *(*rl_complete)(char *token, int *match);
-int (*rl_list_possib)(char *token, char ***av);
+extern char *(*rl_complete)(char *token, int *match);
+extern int (*rl_list_possib)(char *token, char ***av);
 
 /*
 **  For compatibility with FSF readline.

src/complete.c

@@ -24,7 +24,7 @@ strdup(p)
 /*
 **  strcmp-like sorting predicate for qsort.
 */
-STATIC int
+static int
 compare(p1, p2)
     CONST void  *p1;
     CONST void  *p2;
@@ -41,7 +41,7 @@ compare(p1, p2)
 **  Fill in *avp with an array of names that match file, up to its length.
 **  Ignore . and .. .
 */
-STATIC int
+static int
 FindMatches(dir, file, avp)
     char        *dir;
     char        *file;
@@ -124,7 +124,7 @@ FindMatches(dir, file, avp)
 /*
 **  Split a pathname into allocated directory and trailing filename parts.
 */
-STATIC int
+static int
 SplitPath(path, dirpart, filepart)
     char        *path;
     char        **dirpart;

src/editline.h

@@ -35,21 +35,6 @@
 
 typedef unsigned char	CHAR;
 
-#if	defined(HIDE)
-#define STATIC	static
-#else
-#define STATIC	/* NULL */
-#endif	/* !defined(HIDE) */
-
-#if	!defined(CONST)
-#if	defined(__STDC__)
-#define CONST	const
-#else
-#define CONST
-#endif	/* defined(__STDC__) */
-#endif	/* !defined(CONST) */
-
-
 #define MEM_INC		64
 #define SCREEN_INC	256