From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fw@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2178)
 id 0340238582A7; Mon,  4 Jul 2022 13:29:31 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0340238582A7
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] argp: Remove old includes in !_LIBC case
X-Act-Checkin: glibc
X-Git-Author: Guilherme Janczak <guilherme.janczak@yandex.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: c33ada0602fdc3fcf44d6c792844a14b060bbfce
X-Git-Newrev: bb1bd9ec0e126a918b58094f6977e2c5f9ac8e9f
Message-Id: <20220704132931.0340238582A7@sourceware.org>
Date: Mon,  4 Jul 2022 13:29:31 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2022 13:29:31 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bb1bd9ec0e126a918b58094f6977e2c5f9ac8e9f

commit bb1bd9ec0e126a918b58094f6977e2c5f9ac8e9f
Author: Guilherme Janczak <guilherme.janczak@yandex.com>
Date:   Wed Jun 22 14:42:39 2022 +0000

    argp: Remove old includes in !_LIBC case
    
    The headers mempcpy.h, strcase.h, strchrnul.h, and strndup.h are
    included if not building argp for glibc. Commit
    c5af724c0b214a517f8558887f7a70efcfa2c813 added them in 2003 for gnulib,
    but gnulib's current master patches them out:
    https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/argp-namefrob.h;h=9c82ac79c215540f986c3e04398edba3ba1b7234;hb=HEAD

Diff:
---
 argp/argp-namefrob.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/argp/argp-namefrob.h b/argp/argp-namefrob.h
index 2b6a4f1ea8..baed8f1999 100644
--- a/argp/argp-namefrob.h
+++ b/argp/argp-namefrob.h
@@ -76,11 +76,6 @@
 #undef __argp_fmtstream_wmargin
 #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
 
-#include "mempcpy.h"
-#include "strcase.h"
-#include "strchrnul.h"
-#include "strndup.h"
-
 /* normal libc functions we call */
 #undef __flockfile
 #define __flockfile flockfile