Load cups into easysw/current.

[thirdparty/cups.git] / cups / http-private.h

diff --git a/cups/http-private.h b/cups/http-private.h
index d74f2beea013ee77fa511fa7fa5db1ad06fdeadd..bef934ed92e2cbed8cccd2dec17b113425360c45 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 5428 2006-04-18 20:45:30Z mike $"
+ * "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $"
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -31,7 +31,8 @@
  * Include necessary headers...
  */
 
-#  include "config.h"
+#  include <stdlib.h>
+#  include <config.h>
 
 #  ifdef __sun
 /*
@@ -160,19 +161,31 @@ struct ifaddrs                            /**** Interface Structure ****/
   char                 *ifa_name;      /* Name of interface */
   unsigned int         ifa_flags;      /* Flags (up, point-to-point, etc.) */
   struct sockaddr      *ifa_addr,      /* Network address */
-                       *ifa_netmask,   /* Address mask */
-                       *ifa_dstaddr;   /* Broadcast or destination address */
+                       *ifa_netmask;   /* Address mask */
+  union
+  {
+    struct sockaddr    *ifu_broadaddr; /* Broadcast address of this interface. */
+    struct sockaddr    *ifu_dstaddr;   /* Point-to-point destination address. */
+  } ifa_ifu;
+
   void                 *ifa_data;      /* Interface statistics */
 };
 
-static int     _cups_getifaddrs(struct ifaddrs **addrs);
+#  ifndef ifa_broadaddr
+#    define ifa_broadaddr ifa_ifu.ifu_broadaddr
+#  endif /* !ifa_broadaddr */
+#  ifndef ifa_dstaddr
+#    define ifa_dstaddr ifa_ifu.ifu_dstaddr
+#  endif /* !ifa_dstaddr */
+
+extern int     _cups_getifaddrs(struct ifaddrs **addrs);
 #    define getifaddrs _cups_getifaddrs
-static void    _cups_freeifaddrs(struct ifaddrs *addrs);
+extern void    _cups_freeifaddrs(struct ifaddrs *addrs);
 #    define freeifaddrs _cups_freeifaddrs
 #  endif /* HAVE_GETIFADDRS */
 
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 5428 2006-04-18 20:45:30Z mike $".
+ * End of "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $".
  */