Modify the patch so that it compiles without a c99 compiler.

This commit is contained in:
minskim 2007-06-17 19:41:12 +00:00
parent 1527cee98b
commit 5e275430f6
2 changed files with 14 additions and 10 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.16 2007/05/30 19:49:54 rillig Exp $
$NetBSD: distinfo,v 1.17 2007/06/17 19:41:12 minskim Exp $
SHA1 (mDNSResponder-108.tar.gz) = d51509077be75ec8ba49c805fef701c3370428fc
RMD160 (mDNSResponder-108.tar.gz) = 3a1961f3267bcf009b52c8d8ce234ee6045aeed2
@ -6,4 +6,4 @@ Size (mDNSResponder-108.tar.gz) = 1362840 bytes
SHA1 (patch-aa) = 3e8dec4b8d28ed633818edcdea57881dcbb466dc
SHA1 (patch-ab) = 4903e995df9e895bb1cfc49f7fa0c17c8a5379db
SHA1 (patch-ac) = 0613bd07f6626e5c06a3584bef8f2372dfef319a
SHA1 (patch-udns) = 1e224d12593bdaea3019054e53de6693942b988e
SHA1 (patch-udns) = 62710cea2b54af5f5dfca0ba04a36308e4456990

View file

@ -1,17 +1,21 @@
$NetBSD: patch-udns,v 1.1 2007/05/30 19:49:54 rillig Exp $
$NetBSD: patch-udns,v 1.2 2007/06/17 19:41:12 minskim Exp $
The sunpro compiler thinks that union{...} and const union{...} are
different data types and that they may not occur in the ?: operator.
--- mDNSCore/uDNS.c.orig Mon Feb 20 22:40:36 2006
+++ mDNSCore/uDNS.c Wed May 30 21:43:51 2007
@@ -3622,8 +3622,9 @@
--- mDNSCore/uDNS.c.orig 2006-02-20 13:40:36.000000000 -0800
+++ mDNSCore/uDNS.c
@@ -3560,6 +3560,7 @@ mDNSlocal void getZoneData(mDNS *const m
AsyncOpResult result;
ntaContext *context = (ntaContext*)contextPtr;
smAction action;
+ mDNSIPPort zero = zeroIPPort;
// unused
(void)m;
@@ -3622,8 +3623,8 @@ mDNSlocal void getZoneData(mDNS *const m
result.zoneData.primaryAddr.type = mDNSAddrType_IPv4;
AssignDomainName(&result.zoneData.zoneName, &context->zone);
result.zoneData.zoneClass = context->zoneClass;
- result.zoneData.llqPort = context->findLLQPort ? context->llqPort : zeroIPPort;
- result.zoneData.updatePort = context->findUpdatePort ? context->updatePort : zeroIPPort;
+ mDNSIPPort zero = zeroIPPort;
+ result.zoneData.llqPort = context->findLLQPort ? context->llqPort : zero;
+ result.zoneData.updatePort = context->findUpdatePort ? context->updatePort : zero;
context->callback(mStatus_NoError, context->m, context->callbackInfo, &result);