[src/trunk]: src/usr.sbin/memswitch make this build again.

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

details:   https://anonhg.NetBSD.org/src/rev/6a00b611ef2f
branches:  trunk
changeset: 829338:6a00b611ef2f
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 26 09:38:26 2018 +0000

description:
make this build again.

diffstat:

 usr.sbin/memswitch/memswitch.c |  16 ++++++++--------
 usr.sbin/memswitch/memswitch.h |  21 ++++++++++-----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diffs (100 lines):

diff -r b93d4fb7cac0 -r 6a00b611ef2f usr.sbin/memswitch/memswitch.c
--- a/usr.sbin/memswitch/memswitch.c    Fri Jan 26 09:29:15 2018 +0000
+++ b/usr.sbin/memswitch/memswitch.c    Fri Jan 26 09:38:26 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memswitch.c,v 1.14 2018/01/23 22:40:06 sevan Exp $     */
+/*     $NetBSD: memswitch.c,v 1.15 2018/01/26 09:38:26 christos Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,11 +41,11 @@
 
 #include <sys/ioctl.h>
 
-#ifndef DEBUG
+#ifndef SRAMDEBUG
 #include <machine/sram.h>
 #else
 /*
- * DEBUG -- works on other (faster) platforms;
+ * SRAMDEBUG -- works on other (faster) platforms;
  *   store in a regular file instead of actual non-volatile static RAM.
  */
 #define PATH_RAMFILE "/tmp/sramfile"
@@ -290,7 +290,7 @@
 void
 alloc_current_values(void)
 {
-#ifndef DEBUG
+#ifndef SRAMDEBUG
        int i;
        int sramfd = 0;
        struct sram_io buffer;
@@ -367,7 +367,7 @@
 {
        int i;
        int sramfd = 0;
-#ifndef DEBUG
+#ifndef SRAMDEBUG
        struct sram_io buffer;
 #endif
 
@@ -380,7 +380,7 @@
                /* Not modified at all. */
                return;
 
-#ifndef DEBUG
+#ifndef SRAMDEBUG
        /* Assume SRAM_IO_SIZE = n * 16. */
        for (i = 0; i < 256; i += SRAM_IO_SIZE) {
                if (memcmp(&current_values[i], &modified_values[i],
@@ -414,7 +414,7 @@
 int
 save(const char *name)
 {
-#ifndef DEBUG
+#ifndef SRAMDEBUG
        int fd;
 
        alloc_current_values();
@@ -442,7 +442,7 @@
 int
 restore(const char *name)
 {
-#ifndef DEBUG
+#ifndef SRAMDEBUG
        int sramfd, fd, i;
        struct sram_io buffer;
 
diff -r b93d4fb7cac0 -r 6a00b611ef2f usr.sbin/memswitch/memswitch.h
--- a/usr.sbin/memswitch/memswitch.h    Fri Jan 26 09:29:15 2018 +0000
+++ b/usr.sbin/memswitch/memswitch.h    Fri Jan 26 09:38:26 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memswitch.h,v 1.4 2018/01/24 14:45:44 sevan Exp $      */
+/*     $NetBSD: memswitch.h,v 1.5 2018/01/26 09:38:26 christos Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -79,13 +79,12 @@
 extern u_int8_t *current_values;
 extern u_int8_t *modified_values;
 
-static void usage(void) __dead;
-void show_single(const char*));
-void show_all(void));
-void modify_single(const char*));
-void help_single(const char*));
-void alloc_current_values(void));
-void alloc_modified_values(void));
-void flush(void));
-int save(const char*));
-int restore(const char*));
+void show_single(const char*);
+void show_all(void);
+void modify_single(const char*);
+void help_single(const char*);
+void alloc_current_values(void);
+void alloc_modified_values(void);
+void flush(void);
+int save(const char*);
+int restore(const char*);