And now for those who prefer unified diffs…

Grumble!

cnijfilter/src/getipc.c:

$ diff -U 3 getipc.c getipc.c.j
--- getipc.c        Tue May  8 18:45:16 2007
+++ getipc.c.j      Tue Jul 13 23:48:04 2010
@@ -41,7 +41,7 @@
short GetIPCData(LPIPCU pipc, char *sname)
{
-   struct sockaddr_un              sun;
+   struct sockaddr_un      cifsun;
int                                         s, c;
char                                        buf[128];
size_t                                      adrlen;
@@ -52,19 +52,19 @@
unlink(sname);
-   sun.sun_family = AF_UNIX;
-   strncpy(sun.sun_path, sname, sizeof(sun.sun_path) );
-   sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+   cifsun.sun_family = AF_UNIX;
+   strncpy(cifsun.sun_path, sname, sizeof(cifsun.sun_path) );
+   cifsun.sun_path[sizeof(cifsun.sun_path) - 1] = '\0';
-   adrlen = sizeof(sun.sun_family) + strlen(sun.sun_path);
+   adrlen = sizeof(cifsun.sun_family) + strlen(cifsun.sun_path);
-   if (bind(s, (struct sockaddr *)&sun, adrlen))
+   if (bind(s, (struct sockaddr *)&cifsun, adrlen))
return RET_ERROR;
if (listen(s, 5))
return RET_ERROR;
-   while ((c = accept(s, (struct sockaddr *)&sun, &adrlen)) >= 0) {
+   while ((c = accept(s, (struct sockaddr *)&cifsun, &adrlen)) >= 0) {
/* read command first */
read(c, buf, IPCCMDLEN);

And cups-bjnp-0.5.4/bjnp-io.c:

$ diff -U 3 bjnp-io.c bjnp-io.c.j
--- bjnp-io.c       Sun May 17 05:40:57 2009
+++ bjnp-io.c.j     Wed Jul 21 22:34:52 2010
@@ -556,10 +556,17 @@
{
/* send broadcast packet to each suitable  interface */
+#ifndef __sun
if ((interface->ifa_addr == NULL) || (interface->ifa_broadaddr == NULL) ||
(interface->ifa_addr->sa_family != AF_INET) ||
(((struct sockaddr_in *) interface->ifa_addr)->sin_addr.s_addr ==
htonl(INADDR_LOOPBACK)))
+#else
+   if ((interface->ifa_addr == NULL) || (interface->ifa_broadaddr == NULL) ||
+       (interface->ifa_addr->ss_family != AF_INET) ||
+       (((struct sockaddr_in *) interface->ifa_addr)->sin_addr.s_addr ==
+       htonl(INADDR_LOOPBACK)))
+#endif
{
/* not an IPv4 capable interface */