gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / machdep.c

diff --git a/machdep.c b/machdep.c
index fdfcac59a04492efdce597f9b99d9ebf6ac45d15..2578b73c0cb44938c345feb9c2d8e55a77d06efc 100644 (file)
--- a/machdep.c
+++ b/machdep.c
@@ -19,41 +19,30 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.10 2002-09-05 21:25:36 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #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__ */
-
-#define _U_    __attribute__((unused))
+#include <stddef.h>

 
 #ifdef __osf__
 
 #ifdef __osf__

+#include <stdio.h>

 #include <sys/sysinfo.h>
 #include <sys/proc.h>
 #include <sys/sysinfo.h>
 #include <sys/proc.h>

-
-#if !defined(HAVE_SNPRINTF)
-int snprintf(char *, size_t, const char *, ...)
-     __attribute__((format(printf, 3, 4)));
-#endif /* !defined(HAVE_SNPRINTF) */

 #endif /* __osf__ */
 
 #endif /* __osf__ */
 

+#include "varattrs.h"

 #include "machdep.h"
 
 #include "machdep.h"
 

+/*
+ * On platforms where the CPU doesn't support unaligned loads, force
+ * unaligned accesses to abort with SIGBUS, rather than being fixed
+ * up (slowly) by the OS kernel; on those platforms, misaligned accesses
+ * are bugs, and we want tcpdump to crash so that the bugs are reported.
+ *
+ * The only OS on which this is necessary is DEC OSF/1^W^WDigital
+ * UNIX^W^WTru64 UNIX.
+ */

 int
 abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_)
 {
 int
 abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_)
 {