Remove ucb includes from Netatalk, and therefore remove support for SunOS 4.x releases.

diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index b53b2e1c328b03769794d278ef6ab40c560f7415..c9ab87f2079ec7d70e6ada4e38c73cec6c969a20 100644 (file)
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.18 2005-04-28 20:49:46 bfernhomberg Exp $
+ * $Id: main.c,v 1.19 2009-01-16 18:21:16 morgana Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -11,11 +11,7 @@
 
 #include <sys/param.h>
 #include <sys/socket.h>
-#if defined( sun ) && defined( __svr4__ )
-#include </usr/ucbinclude/sys/file.h>
-#else /* sun __svr4__ */
 #include <sys/file.h>
-#endif /* sun __svr4__ */
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/ioctl.h>

diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 2cd04216157d29a0ff5dd83d884888db9a22cf87..e1eae75b044de1bc63db80a1ca3ddc71ea352fd4 100644 (file)
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.19 2008-12-03 18:35:44 didg Exp $
+ * $Id: lp.c,v 1.20 2009-01-16 18:21:16 morgana Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -54,11 +54,7 @@
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
-#if defined( sun ) && defined( __svr4__ )
-#include </usr/ucbinclude/sys/file.h>
-#else /* sun && __svr4__ */
 #include <sys/file.h>
-#endif /* sun && __svr4__ */
 #include <sys/un.h>
 #include <netinet/in.h>
 #undef s_net

diff --git a/etc/papd/main.c b/etc/papd/main.c
index b64b71573fb45bda0dc0920c867b64b3ef6d2f44..4351c6975090409dd72f80e20e90278b4ebe62ea 100644 (file)
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.23 2008-11-14 10:29:08 didg Exp $
+ * $Id: main.c,v 1.24 2009-01-16 18:21:16 morgana Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -14,11 +14,7 @@
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/uio.h>
-#if defined( sun ) && defined( __svr4__ )
-#include </usr/ucbinclude/sys/file.h>
-#else /* sun && __svr4__ */
 #include <sys/file.h>
-#endif /* sun && __svr4__ */
 #include <sys/socket.h>
 #include <atalk/logger.h>