diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:22:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:22:11 +0000 |
commit | d3e365d2474a6f62846ebcc3cfe7811c05d187bc (patch) | |
tree | ad0eddc2ce357f596397ae16e4c4afafb89a1a60 | |
parent | 74dcc9d817215bb2686f1e860c771b9ded2e3e92 (diff) | |
parent | ef76ab62ad22ba6c589e47099550dc3da0e803c9 (diff) | |
download | mdnsresponder-android10-android13-mainline-tzdata-release.tar.gz |
Snap for 6439596 from ef76ab62ad22ba6c589e47099550dc3da0e803c9 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: I0e8ca867770a518851375a5f450612a92660775a
-rw-r--r-- | mDNSShared/dnsextd.c | 2 | ||||
-rw-r--r-- | mDNSShared/dnssd_clientlib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mDNSShared/dnsextd.c b/mDNSShared/dnsextd.c index 9bab16f..cba52d3 100644 --- a/mDNSShared/dnsextd.c +++ b/mDNSShared/dnsextd.c @@ -1996,7 +1996,7 @@ mDNSlocal void GenLLQEvents(DaemonInfo *d) if (!args) { LogErr("GenLLQEvents", "malloc"); return; } args->d = d; args->a = a; - if (pthread_create(&a->tid, NULL, UpdateAnswerList, args)) { LogErr("GenLLQEvents", "pthread_create"); return; } + if (pthread_create(&a->tid, NULL, UpdateAnswerList, args) < 0) { LogErr("GenLLQEvents", "pthread_create"); return; } usleep(1); a = a->next; } diff --git a/mDNSShared/dnssd_clientlib.c b/mDNSShared/dnssd_clientlib.c index d2c69f4..a92c0c8 100644 --- a/mDNSShared/dnssd_clientlib.c +++ b/mDNSShared/dnssd_clientlib.c @@ -363,6 +363,6 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex // NOT static -- otherwise the compiler may optimize it out // The "@(#) " pattern is a special prefix the "what" command looks for -#ifndef ANDROID +#ifndef __ANDROID__ const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")"; #endif |