Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / machdep.c

diff --git a/machdep.c b/machdep.c
index cfdf9d6aff2380e43d23438375b8a04012482203..2bcf317470622099aa0968a329190ff694c98c87 100644 (file)
--- a/machdep.c
+++ b/machdep.c
@@ -20,26 +20,46 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.4 1999-10-07 23:47:10 mcr Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.13 2003-12-15 03:53:21 guy Exp $ (LBL)";
 #endif
 
-#include <sys/types.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/*
+ * XXX - all we need, on platforms other than DEC OSF/1 (a/k/a Digital UNIX,
+ * a/k/a Tru64 UNIX), is "size_t", which is a standard C type; what do we
+ * need to do to get it defined?  This is clearly wrong, as we shouldn't
+ * have to include UNIX or Windows system header files to get it.
+ */
+#include <tcpdump-stdinc.h>
+
+#ifndef HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif /* HAVE___ATTRIBUTE__ */
+
 #ifdef __osf__
 #include <sys/sysinfo.h>
 #include <sys/proc.h>
-#endif
+
+#if !defined(HAVE_SNPRINTF)
+int snprintf(char *, size_t, const char *, ...)
+     __attribute__((format(printf, 3, 4)));
+#endif /* !defined(HAVE_SNPRINTF) */
+#endif /* __osf__ */
 
 #include "machdep.h"
 
 int
-abort_on_misalignment(char *ebuf)
+abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_)
 {
 #ifdef __osf__
        static int buf[2] = { SSIN_UACPROC, UAC_SIGBUS };
 
        if (setsysinfo(SSI_NVPAIRS, (caddr_t)buf, 1, 0, 0) < 0) {
-               (void)sprintf(ebuf, "setsysinfo: errno %d", errno);
+               (void)snprintf(ebuf, ebufsiz, "setsysinfo: errno %d", errno);
                return (-1);
        }
 #endif