--- embedaddon/mpd/src/vars.h	2013/07/22 08:44:29	1.1.1.1
+++ embedaddon/mpd/src/vars.h	2021/03/17 00:39:23	1.1.1.2
@@ -5,7 +5,7 @@
  * Written by Toshiharu OHNO <tony-o@iij.ad.jp>
  * Copyright (c) 1993, Internet Initiative Japan, Inc. All rights reserved.
  * See ``COPYRIGHT.iij''
- * 
+ *
  * Rewritten by Archie Cobbs <archie@freebsd.org>
  * Copyright (c) 1995-1999 Whistle Communications, Inc. All rights reserved.
  * See ``COPYRIGHT.whistle''
@@ -14,6 +14,8 @@
 #ifndef _VARS_H_
 #define	_VARS_H_
 
+#include "defs.h"
+
 #include <sys/types.h>
 
 /*
@@ -22,42 +24,39 @@
 
 /* Describes one option */
 
-  struct confinfo
-  {
-    u_char	peered;		/* Is accept/deny applicable? */
-    u_char	option;		/* Option index (0 <= value < 16) */
-    const char	*name;		/* Textual name; NULL ends list */
-  };
-  typedef const struct confinfo	*ConfInfo;
+struct confinfo {
+	u_char	peered;			/* Is accept/deny applicable? */
+	u_char	option;			/* Option index (0 <= value < 16) */
+	const char *name;		/* Textual name; NULL ends list */
+};
+typedef const struct confinfo *ConfInfo;
 
 /* Generic option configuration structure */
 
-  struct optinfo
-  {
-    u_int32_t	enable;		/* Options I want */
-    u_int32_t	accept;		/* Options I'll allow */
-  };
-  typedef struct optinfo	*Options;
+struct optinfo {
+	u_int32_t enable;		/* Options I want */
+	u_int32_t accept;		/* Options I'll allow */
+};
+typedef struct optinfo *Options;
 
-  #define Enable(c,x)		((c)->enable |= (1<<(x)))
-  #define Disable(c,x)		((c)->enable &= ~(1<<(x)))
-  #define Accept(c,x)		((c)->accept |= (1<<(x)))
-  #define Deny(c,x)		((c)->accept &= ~(1<<(x)))
+#define Enable(c,x)		((c)->enable |= (1<<(x)))
+#define Disable(c,x)		((c)->enable &= ~(1<<(x)))
+#define Accept(c,x)		((c)->accept |= (1<<(x)))
+#define Deny(c,x)		((c)->accept &= ~(1<<(x)))
 
-  #define Enabled(c,x)		(((c)->enable & (1<<(x))) != 0)
-  #define Acceptable(c,x)	(((c)->accept & (1<<(x))) != 0)
+#define Enabled(c,x)		(((c)->enable & (1<<(x))) != 0)
+#define Acceptable(c,x)		(((c)->accept & (1<<(x))) != 0)
 
 /*
  * FUNCTIONS
  */
 
-  extern void	AcceptCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	DenyCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	EnableCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	DisableCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	YesCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	NoCommand(int ac, char *av[], Options opt, ConfInfo conf);
-  extern void	OptStat(Context ctx, Options c, ConfInfo conf);
+extern void AcceptCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void DenyCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void EnableCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void DisableCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void YesCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void NoCommand(int ac, const char *const av[], Options opt, ConfInfo conf);
+extern void OptStat(Context ctx, Options c, ConfInfo conf);
 
 #endif
-