diff --git a/libdnet-stripped/NMAP_MODIFICATIONS b/libdnet-stripped/NMAP_MODIFICATIONS index 7f9f765d4..91fe23a1d 100644 --- a/libdnet-stripped/NMAP_MODIFICATIONS +++ b/libdnet-stripped/NMAP_MODIFICATIONS @@ -490,3 +490,6 @@ Index: libdnet-stripped/src/intf-win32.c ifrow->dwIndex); } else return (-1); + +Copied include/dnet/os.h from libdnet 1.12 to avoid a duplicate typedef +of ssize_t. diff --git a/libdnet-stripped/include/dnet/os.h b/libdnet-stripped/include/dnet/os.h index 3201ac5a5..7fd2fad47 100644 --- a/libdnet-stripped/include/dnet/os.h +++ b/libdnet-stripped/include/dnet/os.h @@ -5,7 +5,7 @@ * * Copyright (c) 2000 Dug Song * - * $Id: os.h,v 1.12 2005/02/15 05:31:00 dugsong Exp $ + * $Id: os.h 583 2005-02-15 05:31:00Z dugsong $ */ #ifndef DNET_OS_H @@ -23,12 +23,8 @@ typedef u_short uint16_t; typedef u_int uint32_t; # ifndef __CYGWIN__ - typedef unsigned int ssize_t; + typedef long ssize_t; # endif -#if !defined(__GNUC__) -typedef unsigned int ssize_t; -#define snprintf _snprintf -#endif #else # include # include @@ -122,8 +118,8 @@ typedef unsigned int ssize_t; # if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L # define __flexarr [] # elif defined(_WIN32) -/* MS VC++ -- using just [] may work, but gives a non-standard extension warning */ -# define __flexarr [1] +/* MS VC++ */ +# define __flexarr [] # else /* Some other non-C99 compiler. Approximate with [1]. */ # define __flexarr [1]