From patchwork Thu Apr 28 12:08:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 616164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qwbHg5m68z9t74 for ; Thu, 28 Apr 2016 22:10:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=yz26L6My; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= LZ+suFGCEQPLr7ta3C7Elk9Qvo8OeNlXgL3JLDiG3N3ZUFkSDUd/c7KJHXB4ZCsy NMxXFqdw0wrlAF+Hrv4e0KODIlx+aXCgGBzuUw3YZHSJwMES33M0Oh37uRlVtkRo 0UI8/vFOCgz5tBTCyE6cNPhXRuvtQUXAQdQty0+mTA4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=mZIKlt avqop+FSY8EN/YtD6dc/U=; b=yz26L6MyWucMPTe9zC/pxG+IIwk/ldFJ1gRrQK jLavQIIbf0qichq2GQrXNBGtiJv4jTGfRdiuL/2fwOFW7DVqf98F5xfGyy9cUqXY afIss6ApmPEl5vFc0FH8znVxLl9CwPeQkMCnQBIbclBXVCUYRwKZTHWn8wADXX31 k/GnU= Received: (qmail 12327 invoked by alias); 28 Apr 2016 12:09:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12057 invoked by uid 89); 28 Apr 2016 12:09:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=2807, 2506 X-HELO: mx1.redhat.com Date: Thu, 28 Apr 2016 14:08:51 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Remove __BIND_NOSTATIC conditionals User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20160428120851.D4768403F10AA@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-04-28 Florian Weimer * resolv/resolv.h: Remove __BIND_NOSTATIC conditional. * resolv/res_data.c: Likewise. diff --git a/resolv/res_data.c b/resolv/res_data.c index 7e848e0..f44c517 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -52,7 +52,6 @@ const char *_res_opcodes[] = { }; libresolv_hidden_data_def (_res_opcodes) -#ifndef __BIND_NOSTATIC void p_query(const u_char *msg) { fp_query(msg, stdout); @@ -186,7 +185,6 @@ hostalias(const char *name) { } libresolv_hidden_def (hostalias) -#endif #include diff --git a/resolv/resolv.h b/resolv/resolv.h index 53c3bba..f55e7ce 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -250,7 +250,6 @@ extern struct __res_state *__res_state(void) __attribute__ ((__const__)); __END_DECLS #define _res (*__res_state()) -#ifndef __BIND_NOSTATIC #define fp_nquery __fp_nquery #define fp_query __fp_query #define hostalias __hostalias @@ -280,7 +279,6 @@ int res_querydomain (const char *, const char *, int, int, int res_search (const char *, int, int, u_char *, int) __THROW; int res_send (const u_char *, int, u_char *, int) __THROW; __END_DECLS -#endif #define b64_ntop __b64_ntop #define b64_pton __b64_pton