diff -u -r --show-c-function --new-file --exclude-from=/home/martinea/src.orig/amanda.diff --ignore-matching-lines='$Id:' amanda-2.5.2/common-src/amanda.h amanda-2.5.2.sockaddr_storage/common-src/amanda.h
--- amanda-2.5.2/common-src/amanda.h	2007-04-10 06:56:00.000000000 -0400
+++ amanda-2.5.2.sockaddr_storage/common-src/amanda.h	2007-05-04 16:40:18.000000000 -0400
@@ -268,6 +268,9 @@ struct iovec {
 #include <arpa/inet.h>
 #endif
 
+#define sockaddr_storage sockaddr_in
+#define ss_family sin_family
+
 /* Calculate the length of the data in a struct sockaddr_storage.
  * THIS IS A HACK.
  *