Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/libexec/ftpd/extern.h,v
rcsdiff: /ftp/cvs/cvsroot/src/libexec/ftpd/extern.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.55.8.1
retrieving revision 1.56
diff -u -p -r1.55.8.1 -r1.56
--- src/libexec/ftpd/extern.h	2008/09/18 18:24:39	1.55.8.1
+++ src/libexec/ftpd/extern.h	2007/07/22 05:06:45	1.56
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.55.8.1 2008/09/18 18:24:39 bouyer Exp $	*/
+/*	$NetBSD: extern.h,v 1.56 2007/07/22 05:06:45 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -32,7 +32,7 @@
  */
 
 /*-
- * Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2005 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -139,7 +139,7 @@ void	feat(void);
 void	format_path(char *, const char *);
 int	ftpd_pclose(FILE *);
 FILE   *ftpd_popen(char *[], const char *, int);
-int	getline(char *, int, FILE *);
+char   *getline(char *, int, FILE *);
 void	init_curclass(void);
 void	logxfer(const char *, off_t, const char *, const char *,
 	    const struct timeval *, const char *);
@@ -200,8 +200,8 @@ int	ftpd_logoutx(const char *, int, int)
 #include <netinet/in.h>
 
 #if defined(__NetBSD__)
-# define HAVE_SETPROCTITLE	1
-# define HAVE_SOCKADDR_SA_LEN	1
+# define HAVE_SETPROCTITLE		1
+# define HAVE_STRUCT_SOCKADDR_SA_LEN	1
 #endif
 
 struct sockinet {
@@ -211,12 +211,12 @@ struct sockinet {
 		struct sockaddr_in6 su_sin6;
 #endif
 	} si_su;
-#if !HAVE_SOCKADDR_SA_LEN
+#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
 	int	si_len;
 #endif
 };
 
-#if !HAVE_SOCKADDR_SA_LEN
+#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
 # define su_len		si_len
 #else
 # define su_len		si_su.su_sin.sin_len
@@ -332,7 +332,7 @@ GLOBAL	krb5_context	kcontext;
 GLOBAL	int		logged_in;
 GLOBAL	int		logging;
 GLOBAL	int		pdata;			/* for passive mode */
-#if HAVE_SETPROCTITLE
+#if defined(HAVE_SETPROCTITLE)
 GLOBAL	char		proctitle[BUFSIZ];	/* initial part of title */
 #endif
 GLOBAL	struct passwd  *pw;