diff -P -r -c prozilla-1.3.6/src/connect.c prozilla-1.3.6.osx/src/connect.c
*** prozilla-1.3.6/src/connect.c	Fri Aug 17 19:38:25 2001
--- prozilla-1.3.6.osx/src/connect.c	Mon Feb 16 01:06:42 2004
***************
*** 28,33 ****
--- 28,34 ----
  #include <fcntl.h>
  #include <netdb.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <netdb.h>
  #include <arpa/inet.h>
***************
*** 347,352 ****
--- 348,354 ----
  	*tmphstbuf = (char *)kmalloc (*hstbuflen);
      }
  
+ #if defined(HAVE_FUNC_GETHOSTBYNAME_R_6) || defined(HAVE_FUNC_GETHOSTBYNAME_R_5)
  #ifdef HAVE_FUNC_GETHOSTBYNAME_R_6
      while (( res = 
  	     gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&hp,&herr))
***************
*** 365,368 ****
--- 367,373 ----
      if (res)
  	return NULL;
      return hp;
+ #else
+     return gethostbyname(host);
+ #endif
  }
diff -P -r -c prozilla-1.3.6/src/connection.c prozilla-1.3.6.osx/src/connection.c
*** prozilla-1.3.6/src/connection.c	Fri Aug 17 19:38:25 2001
--- prozilla-1.3.6.osx/src/connection.c	Mon Feb 16 01:06:41 2004
***************
*** 30,36 ****
--- 30,40 ----
  #include <assert.h>
  #include <pthread.h>
  
+ #ifdef HAVE_SYS_VFS_H
  #include <sys/vfs.h>
+ #else
+ #include <sys/mount.h>
+ #endif
  
  #include "connection.h"
  #include "misc.h"
diff -P -r -c prozilla-1.3.6/src/ftp-retr.c prozilla-1.3.6.osx/src/ftp-retr.c
*** prozilla-1.3.6/src/ftp-retr.c	Fri Aug 17 19:38:27 2001
--- prozilla-1.3.6.osx/src/ftp-retr.c	Mon Feb 16 01:06:41 2004
***************
*** 33,38 ****
--- 33,39 ----
  #include <sys/socket.h>
  #include <sys/time.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <netinet/tcp.h>
  #include <signal.h>
diff -P -r -c prozilla-1.3.6/src/ftpsearch.c prozilla-1.3.6.osx/src/ftpsearch.c
*** prozilla-1.3.6/src/ftpsearch.c	Fri Aug 17 19:38:28 2001
--- prozilla-1.3.6.osx/src/ftpsearch.c	Mon Feb 16 01:06:41 2004
***************
*** 26,31 ****
--- 26,32 ----
  #include <fcntl.h>
  #include <netdb.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <arpa/inet.h>
  #include <errno.h>
diff -P -r -c prozilla-1.3.6/src/getopt.c prozilla-1.3.6.osx/src/getopt.c
*** prozilla-1.3.6/src/getopt.c	Fri Aug 17 19:38:28 2001
--- prozilla-1.3.6.osx/src/getopt.c	Mon Feb 16 01:06:41 2004
***************
*** 1079,1084 ****
--- 1079,1096 ----
      }
  }
  
+ #ifndef HAVE_GETOPT_LONG
+ int getopt_long(argc, argv, optstring, long_opts, long_index )
+ int argc;
+ char *const *argv;
+ const char *optstring;
+ const struct option* long_opts;
+ int* long_index;
+ {
+     return _getopt_internal( argc, argv, optstring, long_opts, long_index, 0 );
+ }
+ #endif
+ 
  int getopt(argc, argv, optstring)
  int argc;
  char *const *argv;
diff -P -r -c prozilla-1.3.6/src/http-retr.c prozilla-1.3.6.osx/src/http-retr.c
*** prozilla-1.3.6/src/http-retr.c	Fri Aug 17 19:38:29 2001
--- prozilla-1.3.6.osx/src/http-retr.c	Mon Feb 16 01:06:41 2004
***************
*** 33,38 ****
--- 33,39 ----
  #include <sys/socket.h>
  #include <sys/time.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <netinet/tcp.h>
  #include <assert.h>
diff -P -r -c prozilla-1.3.6/src/misc.c prozilla-1.3.6.osx/src/misc.c
*** prozilla-1.3.6/src/misc.c	Fri Aug 17 19:38:32 2001
--- prozilla-1.3.6.osx/src/misc.c	Mon Feb 16 01:06:42 2004
***************
*** 24,30 ****
--- 24,37 ----
  #include <stdio.h>
  #include <stdarg.h>
  #include <stdlib.h>
+ 
+ #ifdef HAVE_MALLOC_H
  #include <malloc.h>
+ #endif
+ #ifdef HAVE_SYS_MALLOC_H
+ #include <sys/malloc.h>
+ #endif
+ 
  #include <string.h>
  #include <ctype.h>
  #include <curses.h>
diff -P -r -c prozilla-1.3.6/src/ping.c prozilla-1.3.6.osx/src/ping.c
*** prozilla-1.3.6/src/ping.c	Fri Aug 17 19:38:33 2001
--- prozilla-1.3.6.osx/src/ping.c	Mon Feb 16 01:06:42 2004
***************
*** 16,29 ****
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
  */
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
  #include <unistd.h>
- #include <sys/socket.h>
  #include <fcntl.h>
  #include <netdb.h>
  #include <netinet/in.h>
  #include <netinet/ip.h>
  #include <arpa/inet.h>
  #include <errno.h>
--- 16,33 ----
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
  */
  
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+ 
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdarg.h>
  #include <unistd.h>
  #include <fcntl.h>
  #include <netdb.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <arpa/inet.h>
  #include <errno.h>
***************
*** 32,37 ****
--- 36,42 ----
  #include <sys/time.h>
  #include <ctype.h>
  #include <assert.h>
+ #include <sys/socket.h>
  #include "main.h"
  #include "http.h"
  #include "netrc.h"