=================================================================== RCS file: /home/cvs/OpenXM/src/ox_socket/ox_getport.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- OpenXM/src/ox_socket/ox_getport.c 2000/12/01 08:09:41 1.2 +++ OpenXM/src/ox_socket/ox_getport.c 2000/12/01 08:15:06 1.3 @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenXM$ + * $OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.2 2000/12/01 08:09:41 maekawa Exp $ */ #include @@ -42,11 +42,19 @@ /* Derived from RFC2553 */ #define _SS_MAXSIZE 128 #define _SS_ALIGNSIZE (sizeof(int64_t)) + +#ifdef HAVE_SOCKADDR_LEN +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(uint8_t) - sizeof(sa_family_t)) +#else /* HAVE_SOCKADDR_LEN */ #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(sa_family_t)) +#endif /* HAVE_SOCKADDR_LEN */ #define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(sa_family_t) + _SS_PAD1SIZE + _SS_ALIGNSIZE) struct sockaddr_storage { +#ifdef HAVE_SOCKADDR_LEN + uint8_t __ss_len; +#endif /* HAVE_SOCKADDR_LEN sa_family_t __ss_family; char __ss_pad1[_SS_PAD1SIZE];