Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 659463a925c9b9c4c095d2f0443476034d0ec5b7..cfe3a0c6b0c2836cfaa3116f5341c41283d0d660 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,9 +21,7 @@
 
 /* \summary: AppleTalk printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -126,9 +124,9 @@ struct aarp {
        nd_uint8_t      halen, palen;
        nd_uint16_t     op;
        nd_mac48        hsaddr;
-       uint8_t         psaddr[4];
+       nd_byte         psaddr[4];
        nd_mac48        hdaddr;
-       uint8_t         pdaddr[4];
+       nd_byte         pdaddr[4];
 };
 
 static void atp_print(netdissect_options *, const struct atATP *, u_int);
@@ -427,6 +425,10 @@ atp_bitmap_print(netdissect_options *ndo,
         * The '& 0xff' below is needed for compilers that want to sign
         * extend a u_char, which is the case with the Ultrix compiler.
         * (gcc is smart enough to eliminate it, at least on the Sparc).
+        *
+        * FIXME: If this problem no longer exists, this workaround should be
+        * removed.  Otherwise the problem should be consistently detected and
+        * handled, perhaps at build time.
         */
        if ((bm + 1) & (bm & 0xff)) {
                char c = '<';