diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-01-17 23:54:15 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-01-17 23:54:15 +0000 |
commit | 0268488e2f31bbec0c6b02ff7b7594b3191e6177 (patch) | |
tree | 23495e9caedd80740ae4d956554c014d339da456 /cups/http.h | |
parent | c779abb06a2a4c102b65b3f9f65e4ca6a792fff7 (diff) | |
download | cups-0268488e2f31bbec0c6b02ff7b7594b3191e6177.tar.gz |
Merge changes from CUPS 1.5svn-r9491.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2949 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
-rw-r--r-- | cups/http.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cups/http.h b/cups/http.h index bd6e4571d..6ac8e110e 100644 --- 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 |