More Solaris 10 stuff
Frank Lahm <franklahm <at> googlemail.com>
2009-01-09 09:38:57 GMT
Hi,
these files:
etc/papd/main.c
etc/papd/lp.c
etc/atalkd/main.c
... #include stuff from /usr/ucbinclude which on opensolaris is not
present anymore. SUN tells us [1]. There are two choices how we could
procede:
- remove the #ifdef check for solaris and just include
"/usr/include/sys/stat.h". This is likely to break building on older
Solaris releases.
- add autoconf check for the presence of /usr/ucbinclude/sys/stat.h
and fall back to /usr/include/sys/stat.h if not present
I'd prefer to pull the plug and remove the #ifdef stuff. Patched that
way it builds fine on opensolaris.
-Frank
[1] http://developers.sun.com/solaris/articles/portingtosolaris.html:
"For historical reasons, the Solaris OS also provides include files
and runtime libraries compatible with SunOS 4.X, in /usr/ucbinclude
and /usr/ucblib. For new ports to the Solaris OS, these ucb functions
should be avoided in preference to the normal system routine."
Index: etc/atalkd/main.c
===================================================================
RCS file: /var/cvsroot/netatalk/etc/atalkd/main.c,v
retrieving revision 1.1.1.1
diff -u -w -b -r1.1.1.1 main.c
--- etc/atalkd/main.c 5 Nov 2008 11:46:10 -0000 1.1.1.1
+++ etc/atalkd/main.c 8 Jan 2009 16:35:25 -0000
<at> <at> -11,11 +12,7 <at> <at>
#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>
Index: etc/papd/lp.c
===================================================================
RCS file: /var/cvsroot/netatalk/etc/papd/lp.c,v
retrieving revision 1.1.1.2
diff -u -w -b -r1.1.1.2 lp.c
--- etc/papd/lp.c 17 Nov 2008 09:08:50 -0000 1.1.1.2
+++ etc/papd/lp.c 8 Jan 2009 16:35:24 -0000
<at> <at> -54,11 +55,7 <at> <at>
#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
Index: etc/papd/main.c
===================================================================
RCS file: /var/cvsroot/netatalk/etc/papd/main.c,v
retrieving revision 1.1.1.2
diff -u -w -b -r1.1.1.2 main.c
--- etc/papd/main.c 17 Nov 2008 09:08:50 -0000 1.1.1.2
+++ etc/papd/main.c 8 Jan 2009 16:35:25 -0000
<at> <at> -14,11 +15,7 <at> <at>
#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>
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Netatalk-devel mailing list
Netatalk-devel <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/netatalk-devel