summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Sławiński (amade) <amade@asmblr.net>2011-01-05 21:51:49 +0100
committerAmadeusz Sławiński <amade@asmblr.net>2014-05-15 17:35:04 +0200
commit61f060f88f744cc61790820443aa910c9c4b16af (patch)
tree4f545e6d44459f48287b4d6c9102ee859ab0d915
parenta55e91e78ecf4fd8acd891399161690890e773c5 (diff)
downloadscreen-61f060f88f744cc61790820443aa910c9c4b16af.tar.gz
fix some of -Wnested-externs warnings
-rw-r--r--src/ansi.c2
-rw-r--r--src/fileio.c4
-rw-r--r--src/misc.c2
-rw-r--r--src/process.c2
-rw-r--r--src/socket.c2
-rw-r--r--src/window.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/src/ansi.c b/src/ansi.c
index 0fb7ae6..027e3b8 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -2707,7 +2707,7 @@ WReverseVideo(struct win *p, int on)
void
WMsg(struct win *p, int err, char *str)
{
- extern struct layer *flayer;
+ struct layer *flayer;
struct layer *oldflayer = flayer;
flayer = &p->w_layer;
LMsg(err, "%s", str);
diff --git a/src/fileio.c b/src/fileio.c
index a8d27c1..e691fd2 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -350,8 +350,8 @@ RcLine(char *ubuf, int ubufl)
{
char *args[MAXARGS];
int argl[MAXARGS];
- extern struct acluser *EffectiveAclUser; /* acl.c */
- extern struct acluser *users; /* acl.c */
+ struct acluser *EffectiveAclUser; /* acl.c */
+ struct acluser *users; /* acl.c */
if (display)
{
diff --git a/src/misc.c b/src/misc.c
index 6590f5f..179ffd0 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -598,7 +598,7 @@ int
_delay(register int delay, int (*outc) (int))
{
int pad;
- extern short ospeed;
+ short ospeed;
static short osp2pad[] = {
0,2000,1333,909,743,666,500,333,166,83,55,41,20,10,5,2,1,1
};
diff --git a/src/process.c b/src/process.c
index 2506467..8a7ed7e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2941,7 +2941,7 @@ DoAction(struct action *act, int key)
case RC_BREAKTYPE:
{
static char *types[] = { "TIOCSBRK", "TCSBRK", "tcsendbreak", NULL };
- extern int breaktype;
+ int breaktype;
if (*args)
{
diff --git a/src/socket.c b/src/socket.c
index a02a109..b58a0b3 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1578,7 +1578,7 @@ DoCommandMsg(struct msg *mp)
int n;
register char *p = mp->m.command.cmd;
struct acluser *user;
- extern struct acluser *EffectiveAclUser; /* acls.c */
+ struct acluser *EffectiveAclUser; /* acls.c */
n = mp->m.command.nargs;
if (n > MAXARGS - 1)
diff --git a/src/window.c b/src/window.c
index 294d858..8e9748b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -509,7 +509,7 @@ MakeWindow(struct NewWindow *newwin)
struct NewWindow nwin;
int type, startat;
char *TtyName;
- extern struct acluser *users;
+ struct acluser *users;
if (!wtab)
{
@@ -2010,7 +2010,7 @@ zmodem_found(struct win *p, int send, char *bp, int len)
{
char *s;
int i, n;
- extern int zmodem_mode;
+ int zmodem_mode;
/* check for abort sequence */
n = 0;