diff options
Diffstat (limited to 'pcap-stdinc.h')
| -rw-r--r-- | pcap-stdinc.h | 95 |
1 files changed, 69 insertions, 26 deletions
diff --git a/pcap-stdinc.h b/pcap-stdinc.h index f70dcce86bed..a1be68098865 100644 --- a/pcap-stdinc.h +++ b/pcap-stdinc.h @@ -28,6 +28,35 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +/* + * Copyright (C) 1999 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #ifndef pcap_stdinc_h #define pcap_stdinc_h @@ -45,39 +74,53 @@ #include <time.h> #include <io.h> -#include "bittypes.h" -#include "IP6_misc.h" - -#define caddr_t char* +#include <ws2tcpip.h> #if defined(_MSC_VER) - #define snprintf _snprintf - #define vsnprintf _vsnprintf - #define strdup _strdup -#endif + /* + * MSVC. + */ + #if _MSC_VER >= 1800 + /* + * VS 2013 or newer; we have <inttypes.h>. + */ + #include <inttypes.h> -#define inline __inline + #define u_int8_t uint8_t + #define u_int16_t uint16_t + #define u_int32_t uint32_t + #define u_int64_t uint64_t + #else + /* + * Earlier VS; we have to define this stuff ourselves. + */ + #ifndef HAVE_U_INT8_T + typedef unsigned char u_int8_t; + typedef signed char int8_t; + #endif -#ifdef __MINGW32__ - #include <stdint.h> -#else - #ifndef _UINTPTR_T_DEFINED - #ifdef _WIN64 - typedef unsigned __int64 uintptr_t; - #else - typedef _W64 unsigned int uintptr_t; + #ifndef HAVE_U_INT16_T + typedef unsigned short u_int16_t; + typedef signed short int16_t; + #endif + + #ifndef HAVE_U_INT32_T + typedef unsigned int u_int32_t; + typedef signed int int32_t; #endif - #define _UINTPTR_T_DEFINED - #endif - #ifndef _INTPTR_T_DEFINED - #ifdef _WIN64 - typedef __int64 intptr_t; - #else - typedef _W64 int intptr_t; + #ifndef HAVE_U_INT64_T + #ifdef _MSC_EXTENSIONS + typedef unsigned _int64 u_int64_t; + typedef _int64 int64_t; + #else /* _MSC_EXTENSIONS */ + typedef unsigned long long u_int64_t; + typedef long long int64_t; + #endif #endif - #define _INTPTR_T_DEFINED #endif -#endif /*__MINGW32__*/ +#elif defined(__MINGW32__) + #include <stdint.h> +#endif #endif /* pcap_stdinc_h */ |