Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 1fe7194f442806e2bcff6a4d249b8b2361ef4ac3..32f8fc920b0111c079f2abf1c7bcd353493e1422 100644 (file)
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -39,6 +39,8 @@
 #ifndef tcpdump_stdinc_h
 #define tcpdump_stdinc_h
 
 #ifndef tcpdump_stdinc_h
 #define tcpdump_stdinc_h
 

+#include <errno.h>
+

 #ifdef WIN32
 
 #include <stdint.h>
 #ifdef WIN32
 
 #include <stdint.h>


@@ -49,15 +51,10 @@
 #include <ctype.h>
 #include <time.h>
 #include <io.h>
 #include <ctype.h>
 #include <time.h>
 #include <io.h>

-#include <errno.h>

 #include <fcntl.h>
 #include <sys/types.h>
 #include <net/netdb.h>  /* in wpcap's Win32/include */
 
 #include <fcntl.h>
 #include <sys/types.h>
 #include <net/netdb.h>  /* in wpcap's Win32/include */
 

-#ifndef NBBY
-#define NBBY   8
-#endif
-

 #ifndef uint8_t
 #define uint8_t                unsigned char
 #endif
 #ifndef uint8_t
 #define uint8_t                unsigned char
 #endif


@@ -238,11 +235,10 @@ typedef char* caddr_t;
  * Note: this also requires that padding be put into the structure,
  * at least for compilers where it's implemented as __attribute__((packed)).
  */
  * Note: this also requires that padding be put into the structure,
  * at least for compilers where it's implemented as __attribute__((packed)).
  */

-#if defined(__GNUC__)
+#if !(defined(_MSC_VER) && defined(UNALIGNED))
+/* MSVC may have its own macro defined with the same name and purpose. */

 #undef UNALIGNED
 #define UNALIGNED      __attribute__((packed))
 #undef UNALIGNED
 #define UNALIGNED      __attribute__((packed))

-#else
- /* MSVC may have its own macro defined with the same name and purpose. */

 #endif
 
 #if defined(WIN32) || defined(MSDOS)
 #endif
 
 #if defined(WIN32) || defined(MSDOS)