===================================================================
RCS file: /home/cvs/OpenXM/src/ox_socket/ox_getport.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM/src/ox_socket/ox_getport.c	2000/12/01 08:34:37	1.5
+++ OpenXM/src/ox_socket/ox_getport.c	2000/12/01 17:42:26	1.8
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.4 2000/12/01 08:16:27 maekawa Exp $
+ *	$OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.7 2000/12/01 17:37:53 maekawa Exp $
  */
 
 #include <sys/types.h>
@@ -38,30 +38,32 @@
 
 #include "ox_socket.h"
 
-#ifndef INET6
+#ifndef HAVE_SOCKADDR_STORAGE
 /* 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))
+#define	_SS_PAD2SIZE	(_SS_ALIGNSIZE - sizeof(uint8_t) - sizeof(sa_family_t) \
+			 - _SS_PAD1SIZE - _SS_ALIGNSIZE)
 #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)
+			 - _SS_PAD1SIZE - _SS_ALIGNSIZE)
+#endif /* HAVE_SOCKADDR_LEN */
 
 struct sockaddr_storage {
 #ifdef HAVE_SOCKADDR_LEN
-	uint8_t		__ss_len;
+	uint8_t		ss_len;
 #endif /* HAVE_SOCKADDR_LEN */
-	sa_family_t	__ss_family;
+	sa_family_t	ss_family;
 
 	char		__ss_pad1[_SS_PAD1SIZE];
 	int64_t		__ss_align;
 	char		__ss_pad2[_SS_PAD2SIZE];
 };
-#endif /* INET6 */
+#endif /* HAVE_SOCKADDR_STORAGE */
 
 int
 ox_getport(int sock)
@@ -74,7 +76,7 @@ ox_getport(int sock)
 		return (-1);
 	}
 
-	switch (ss.__ss_family) {
+	switch (ss.ss_family) {
 	case AF_INET:
 	{
 		struct sockaddr_in *sin;