diff --git a/Makefile b/Makefile index 16f33b6..25c9dbb 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,7 @@ isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \ line.o: line.c line.h utf8.h buffer.h crypt.h edef.h estruct.h retcode.h \ log.h window.h defines.h lock.o: lock.c lock.h estruct.h retcode.h display.h edef.h buffer.h \ - crypt.h line.h utf8.h input.h pklock.h + crypt.h line.h utf8.h input.h log.o: log.c log.h retcode.h main.o: main.c basic.h bind.h edef.h buffer.h crypt.h line.h utf8.h \ estruct.h retcode.h bindable.h display.h eval.h execute.h file.h input.h \ @@ -181,8 +181,7 @@ names.o: names.c names.h basic.h bind.h edef.h buffer.h crypt.h line.h \ isearch.h region.h random.h search.h spawn.h window.h defines.h word.h pklock.o: pklock.c pklock.h estruct.h retcode.h edef.h buffer.h crypt.h \ line.h utf8.h -posix.o: posix.c termio.h estruct.h retcode.h edef.h buffer.h crypt.h \ - line.h utf8.h +posix.o: posix.c termio.h random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \ display.h estruct.h retcode.h edef.h execute.h input.h log.h search.h \ terminal.h defines.h window.h @@ -196,7 +195,7 @@ spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \ terminal.h window.h tcap.o: tcap.c terminal.h defines.h display.h estruct.h retcode.h edef.h \ buffer.h crypt.h line.h utf8.h termio.h -termio.o: termio.c termio.h +termio.o: termio.c termio.h estruct.h retcode.h utf8.h utf8.o: utf8.c utf8.h vmsvt.o: vmsvt.c estruct.h retcode.h edef.h buffer.h crypt.h line.h \ utf8.h diff --git a/edef.h b/edef.h index 6743275..f8a1ac4 100644 --- a/edef.h +++ b/edef.h @@ -59,7 +59,6 @@ extern int abortc; /* current abort command char */ extern int quotec; /* quote char during mlreply() */ extern int tabmask; -extern char *cname[]; /* names of colors */ #if 0 diff --git a/globals.c b/globals.c index a06968e..fe94fe3 100644 --- a/globals.c +++ b/globals.c @@ -66,13 +66,6 @@ int abortc = CONTROL | 'G'; /* current abort command char */ int quotec = 0x11; /* quote char during mlreply() */ int tabmask = 0x07; /* tabulator mask */ -char *cname[] = { /* names of colors */ - "BLACK", "RED", "GREEN", "YELLOW", "BLUE", - "MAGENTA", "CYAN", "WHITE" -#if PKCODE & IBMPC - , "HIGH" -#endif -}; kbdstate kbdmode = STOP; /* current keyboard macro mode */ diff --git a/random.c b/random.c index c5dd248..bee1088 100644 --- a/random.c +++ b/random.c @@ -24,6 +24,14 @@ #include "terminal.h" #include "window.h" +static const char *cname[] = { /* names of colors */ + "BLACK", "RED", "GREEN", "YELLOW", "BLUE", + "MAGENTA", "CYAN", "WHITE" +#if PKCODE & IBMPC + , "HIGH" +#endif +} ; + int tabsize; /* Tab size (0: use real tabs) */ /*