Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin fix nested extern.



details:   https://anonhg.NetBSD.org/src/rev/86713e0e1df8
branches:  trunk
changeset: 503302:86713e0e1df8
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 19:32:26 2001 +0000

description:
fix nested extern.

diffstat:

 bin/ln/ln.c    |  7 ++++---
 bin/ls/print.c |  9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (86 lines):

diff -r 8964ef7ece53 -r 86713e0e1df8 bin/ln/ln.c
--- a/bin/ln/ln.c       Sun Feb 04 19:26:04 2001 +0000
+++ b/bin/ln/ln.c       Sun Feb 04 19:32:26 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ln.c,v 1.16 1999/09/05 23:34:40 hubertf Exp $  */
+/*     $NetBSD: ln.c,v 1.17 2001/02/04 19:32:26 christos Exp $ */
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)ln.c       8.2 (Berkeley) 3/31/94";
 #else
-__RCSID("$NetBSD: ln.c,v 1.16 1999/09/05 23:34:40 hubertf Exp $");
+__RCSID("$NetBSD: ln.c,v 1.17 2001/02/04 19:32:26 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,6 +63,8 @@
                                        /* System link call. */
 int (*linkf) __P((const char *, const char *));
 
+extern char *__progname;
+
 int    linkit __P((char *, char *, int));
 void   usage __P((void));
 int    main __P((int, char *[]));
@@ -173,7 +175,6 @@
 usage()
 {
 
-       extern char *__progname;
        (void)fprintf(stderr,
            "Usage:\t%s [-fhns] file1 file2\n\t%s [-fhns] file ... directory\n",
            __progname, __progname);
diff -r 8964ef7ece53 -r 86713e0e1df8 bin/ls/print.c
--- a/bin/ls/print.c    Sun Feb 04 19:26:04 2001 +0000
+++ b/bin/ls/print.c    Sun Feb 04 19:32:26 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.30 2000/07/29 03:46:15 lukem Exp $ */
+/*     $NetBSD: print.c,v 1.31 2001/02/04 19:34:08 christos Exp $      */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c    8.5 (Berkeley) 7/28/94";
 #else
-__RCSID("$NetBSD: print.c,v 1.30 2000/07/29 03:46:15 lukem Exp $");
+__RCSID("$NetBSD: print.c,v 1.31 2001/02/04 19:34:08 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,6 +64,8 @@
 #include "ls.h"
 #include "extern.h"
 
+extern int termwidth;
+
 static int     printaname(FTSENT *, int, int);
 static void    printlink(FTSENT *);
 static void    printtime(time_t);
@@ -146,7 +148,6 @@
 void
 printcol(DISPLAY *dp)
 {
-       extern int termwidth;
        static FTSENT **array;
        static int lastentries = -1;
        FTSENT *p;
@@ -209,7 +210,6 @@
 void
 printacol(DISPLAY *dp)
 {
-       extern int termwidth;
        FTSENT *p;
        int chcnt, col, colwidth;
        int numcols;
@@ -254,7 +254,6 @@
 void
 printstream(DISPLAY *dp)
 {
-       extern int termwidth;
        FTSENT *p;
        int col;
        int extwidth;



Home | Main Index | Thread Index | Old Index