Fix compilation on DragonFly BSD (STR #3738)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9427 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index 63af63b3fa28f3b56e7151f0e8b6dd20879bb7df..1130535fdc69621d8f0d01d0b8403ee483119da1 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -4,6 +4,7 @@ CHANGES-1.4.txt
 CHANGES IN CUPS V1.4.7
 
        - Documentation changes (STR #3720)
+       - Fixed a compilation problem on DragonFly BSD (STR #3738)
        - The default PageLogFormat value had the username and job ID swapped
          from CUPS 1.3.x (STR #3727)
        - The web interface did not allow setting of a default custom page size

diff --git a/cups/http.h b/cups/http.h
index c33da9e66c71cbe14b0eec3e5cbabd7eccc2b85a..0ede1169dbbac1123c2074d8dcdd6b6936f359d4 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -3,7 +3,7 @@
  *
  *   Hyper-Text Transport Protocol definitions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -88,7 +88,7 @@ extern "C" {
 #if defined(AF_INET6) && !defined(s6_addr32)
 #  if defined(__sun)
 #    define s6_addr32  _S6_un._S6_u32
-#  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__)
 #    define s6_addr32  __u6_addr.__u6_addr32
 #  elif defined(__osf__)
 #    define s6_addr32  s6_un.sa6_laddr