| libnet-types.h | libnet-types.h | |||
|---|---|---|---|---|
| skipping to change at line 35 | skipping to change at line 35 | |||
| * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | |||
| * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | |||
| * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||
| * SUCH DAMAGE. | * SUCH DAMAGE. | |||
| * | * | |||
| */ | */ | |||
| #ifndef __LIBNET_TYPES_H | #ifndef __LIBNET_TYPES_H | |||
| #define __LIBNET_TYPES_H | #define __LIBNET_TYPES_H | |||
| #ifdef HAVE_CONFIG_H | #if (__sun__ && __svr4__) | |||
| #include "../config.h" | /* libnet should be using the standard type names, but in the short term | |||
| #endif | * define our non-standard type names in terms of the standard names. | |||
| */ | ||||
| /* Solaris has messed up POSIX nomenclature for int types */ | ||||
| #if HAVE_SOLARIS | ||||
| #include <inttypes.h> | #include <inttypes.h> | |||
| #else | ||||
| #include <stdint.h> | ||||
| #endif | ||||
| /* | ||||
| typedef uint8_t u_int8_t; | typedef uint8_t u_int8_t; | |||
| typedef uint16_t u_int16_t; | typedef uint16_t u_int16_t; | |||
| typedef uint32_t u_int32_t; | typedef uint32_t u_int32_t; | |||
| typedef uint64_t u_int64_t; | typedef uint64_t u_int64_t; | |||
| */ | #endif | |||
| #endif /* __LIBNET_TYPES_H */ | #endif /* __LIBNET_TYPES_H */ | |||
| /* EOF */ | /* EOF */ | |||
| End of changes. 3 change blocks. | ||||
| 12 lines changed or deleted | 5 lines changed or added | |||
| libnet.h | libnet.h | |||
|---|---|---|---|---|
| skipping to change at line 93 | skipping to change at line 93 | |||
| #include <net/if.h> | #include <net/if.h> | |||
| #else /* __WIN32__ */ | #else /* __WIN32__ */ | |||
| #if (__CYGWIN__) | #if (__CYGWIN__) | |||
| #include <sys/socket.h> | #include <sys/socket.h> | |||
| #endif | #endif | |||
| #include <ws2tcpip.h> | #include <ws2tcpip.h> | |||
| #include <windows.h> | #include <windows.h> | |||
| #include <winsock2.h> | #include <winsock2.h> | |||
| #include <win32/in_systm.h> | #include <win32/in_systm.h> | |||
| #endif /* __WIN32__ */ | #endif /* __WIN32__ */ | |||
| #if !(__linux__) && !(__WIN32__) && !(__APPLE__) && !(__CYGWIN__) | #if !(__linux__) && !(__WIN32__) && !(__APPLE__) && !(__CYGWIN__) && !(__GN U__) | |||
| #include <netinet/ip_var.h> | #include <netinet/ip_var.h> | |||
| #else /* __linux__ */ | #else /* __linux__ */ | |||
| #if (HAVE_NET_ETHERNET_H) | #if (HAVE_NET_ETHERNET_H) | |||
| #include <net/ethernet.h> | #include <net/ethernet.h> | |||
| #endif /* HAVE_NET_ETHERNET_H */ | #endif /* HAVE_NET_ETHERNET_H */ | |||
| #endif /* __linux__ */ | #endif /* __linux__ */ | |||
| #if !defined(__WIN32__) | #if !defined(__WIN32__) | |||
| #include <netinet/tcp.h> | #include <netinet/tcp.h> | |||
| #include <netinet/udp.h> | #include <netinet/udp.h> | |||
| #if (__linux__) && !(__GLIBC__) | #if (__linux__) && !(__GLIBC__) | |||
| skipping to change at line 116 | skipping to change at line 116 | |||
| #else | #else | |||
| #include <netinet/igmp.h> | #include <netinet/igmp.h> | |||
| #endif | #endif | |||
| #include <arpa/inet.h> | #include <arpa/inet.h> | |||
| #include <sys/time.h> | #include <sys/time.h> | |||
| #include <netdb.h> | #include <netdb.h> | |||
| #endif /* __WIN32__ */ | #endif /* __WIN32__ */ | |||
| #include <errno.h> | #include <errno.h> | |||
| #include <stdarg.h> | #include <stdarg.h> | |||
| #define LIBNET_VERSION "1.1.3" | #define LIBNET_VERSION "1.1.4" | |||
| #define LIBNET_LIL_ENDIAN 1 | #define LIBNET_LIL_ENDIAN 1 | |||
| #include "./libnet/libnet-types.h" | #include "./libnet/libnet-types.h" | |||
| #include "./libnet/libnet-macros.h" | #include "./libnet/libnet-macros.h" | |||
| #include "./libnet/libnet-headers.h" | #include "./libnet/libnet-headers.h" | |||
| #include "./libnet/libnet-structures.h" | #include "./libnet/libnet-structures.h" | |||
| #include "./libnet/libnet-asn1.h" | #include "./libnet/libnet-asn1.h" | |||
| #include "./libnet/libnet-functions.h" | #include "./libnet/libnet-functions.h" | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||