commit - bea01bd1a3ecf3dbb611dd38a66b08ac3944f1c9
commit + 96c0dd284ef3df7f654c887ac5458f9b14bdaf3b
blob - 23e55e160026e0f10989876b0bbe7f97bc3e1804
blob + 4f49551e0418842e90e9b42932b7a4afc9426fc1
--- include/got_compat2.h
+++ include/got_compat2.h
@@ -258,36 +258,8 @@ void uuid_to_string(uuid_t *, char **, uint32_t *);
 #define SHA1Init	SHA1_Init
 #define SHA1Update	SHA1_Update
 #define SHA1Final	SHA1_Final
-#endif
-
-/*
- * The following SA_LEN/SS_LEN dance comes from various source, notably
- * OpenSMTP by way of OpenNTPD and OpenBGPD (thanks everyone!).  got-portable
- * has tweaked a lot of the following macros to suit the needs of
- * got-portable.
- */
-
-/* From OpenNTPD portable */
-#if !defined(SA_LEN)
-# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
-#  define SA_LEN(x)	((x)->sa_len)
-# else
-#  define SA_LEN(x)     ((x)->sa_family == AF_INET6 ? \
-			sizeof(struct sockaddr_in6) : \
-			sizeof(struct sockaddr_in))
-# endif
-
 #endif
 
-/* From OpenBGPD portable */
-#if !defined(SS_LEN)
-# if defined(HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN)
-#  define SS_LEN(x)  ((x)->ss_len)
-# else
-#  define SS_LEN(x)  SA_LEN((struct sockaddr *)(x))
-# endif
-#endif
-
 /* SOCK_NONBLOCK isn't available across BSDs... */
 #if !defined(SOCK_NONBLOCK) && !defined(__linux__)
 #define SOCK_NONBLOCK 00004000