back port from HEAD: Remove ucb includes from Netatalk, and therefore remove support...

diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index cb720664e7c587ee38c33a624a39a3cb9e08779f..9aa86b34605e75baa2321320a3aef269b1eea2c6 100644 (file)
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.17.8.6.2.2 2005-09-27 10:40:41 didg Exp $
+ * $Id: main.c,v 1.17.8.6.2.3 2009-01-19 02:25:57 didg 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 6740a386c9c86d15d47f8ac7d7273bc292daefde..fca724e72ca34af5d5d96f965e2af590f8e11582 100644 (file)
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.14.8.4.2.4 2008-11-25 15:16:33 didg Exp $
+ * $Id: lp.c,v 1.14.8.4.2.5 2009-01-19 02:25:57 didg 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 de9ca08baf9972069176aebf462d6563549b986b..a2a9b10cffd9674d44cb7ab1f585de547848b69c 100644 (file)
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.18.6.2.2.4 2008-11-14 10:04:52 didg Exp $
+ * $Id: main.c,v 1.18.6.2.2.5 2009-01-19 02:25:57 didg 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>