[src/trunk]: src/bin/sh Fix things so that STATIC can me made static (-DSTATI...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/275865247a5a
branches:  trunk
changeset: 345026:275865247a5a
user:      kre <kre%NetBSD.org@localhost>
date:      Tue May 03 13:47:58 2016 +0000

description:
Fix things so that STATIC can me made static (-DSTATIC=static)
and have the shell still compile, link, and run...

ok christos@

diffstat:

 bin/sh/eval.c  |  10 +++++-----
 bin/sh/exec.h  |   3 +--
 bin/sh/shell.h |   4 +++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (77 lines):

diff -r 1387fc868163 -r 275865247a5a bin/sh/eval.c
--- a/bin/sh/eval.c     Tue May 03 13:43:11 2016 +0000
+++ b/bin/sh/eval.c     Tue May 03 13:47:58 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.121 2016/05/03 03:12:40 kre Exp $   */
+/*     $NetBSD: eval.c,v 1.122 2016/05/03 13:47:58 kre Exp $   */
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c     8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.121 2016/05/03 03:12:40 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.122 2016/05/03 13:47:58 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1155,19 +1155,19 @@
                                     pathval());
 }
 
-STATIC int
+int
 in_function(void)
 {
        return funcnest;
 }
 
-STATIC enum skipstate
+enum skipstate
 current_skipstate(void)
 {
        return evalskip;
 }
 
-STATIC void
+void
 stop_skipping(void)
 {
        evalskip = SKIPNONE;
diff -r 1387fc868163 -r 275865247a5a bin/sh/exec.h
--- a/bin/sh/exec.h     Tue May 03 13:43:11 2016 +0000
+++ b/bin/sh/exec.h     Tue May 03 13:47:58 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.h,v 1.23 2012/03/15 02:02:20 joerg Exp $  */
+/*     $NetBSD: exec.h,v 1.24 2016/05/03 13:47:58 kre Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -70,7 +70,6 @@
 void changepath(const char *);
 void deletefuncs(void);
 void getcmdentry(char *, struct cmdentry *);
-void addcmdentry(char *, struct cmdentry *);
 void defun(char *, union node *);
 int unsetfunc(char *);
 void hash_special_builtins(void);
diff -r 1387fc868163 -r 275865247a5a bin/sh/shell.h
--- a/bin/sh/shell.h    Tue May 03 13:43:11 2016 +0000
+++ b/bin/sh/shell.h    Tue May 03 13:47:58 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shell.h,v 1.18 2013/04/28 17:01:28 dholland Exp $      */
+/*     $NetBSD: shell.h,v 1.19 2016/05/03 13:47:58 kre Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -66,7 +66,9 @@
 #ifndef NULL
 #define NULL (void *)0
 #endif
+#ifndef STATIC
 #define STATIC /* empty */
+#endif
 #define MKINIT /* empty */
 
 #include <sys/cdefs.h>