We also need to undefine BPF_JUMP to avoid warnings.

diff --git a/testprogs/valgrindtest.c b/testprogs/valgrindtest.c
index 7d04a6f3bdd6cb979660119523f2600f0b7c8f48..c6e566b081026648c2cfa62a7e86428d312089b7 100644 (file)
--- a/testprogs/valgrindtest.c
+++ b/testprogs/valgrindtest.c
@@ -108,13 +108,15 @@ The Regents of the University of California.  All rights reserved.\n";
  * is Valgrind's checking of the system call to set the filter, and we
  * also include <pcap.h> to open the device in the first place, and that
  * means that we may get collisions between their definitions of
  * is Valgrind's checking of the system call to set the filter, and we
  * also include <pcap.h> to open the device in the first place, and that
  * means that we may get collisions between their definitions of

- * BPF_STMT - and do, in fact, get them on Linux (the definitons may be
- * semantically the same, but that's not sufficient to avoid the warnings,
- * as the preprocessor doesn't know that u_short is just unsigned short).
+ * BPF_STMT and BPF_JUMP - and do, in fact, get them on Linux (the
+ * definitons may be semantically the same, but that's not sufficient to
+ * avoid the warnings, as the preprocessor doesn't know that u_short is
+ * just unsigned short).

  *
  *

- * So we undefine BPF_STMT to avoid the warning.
+ * So we undefine BPF_STMT and BPF_JUMP to avoid the warning.

  */
 #undef BPF_STMT
  */
 #undef BPF_STMT

+#undef BPF_JUMP

 #include <pcap.h>
 
 static char *program_name;
 #include <pcap.h>
 
 static char *program_name;