From: Andreas Jaeger <aj@suse.de>
To: GNU libc hacker <libc-hacker@sourceware.cygnus.com>
Subject: [Patch] Current glibc 2.1.3 doesn't build: gconv_db broken
Date: Wed, 08 Dec 1999 02:51:00 -0000 [thread overview]
Message-ID: <u8bt81emvu.fsf@gromit.rhein-neckar.de> (raw)
The last backported patch from 2.2 for gconv_db is broken. I'm
appending the trivial fix.
Andreas
1999-12-08 Andreas Jaeger <aj@suse.de>
* iconv/gconv_db.c (increment_counter): Fix problems in last
patch: Rename identifiers for glibc 2.1 usage.
============================================================
Index: iconv/gconv_db.c
--- iconv/gconv_db.c 1999/12/08 04:34:17 1.24.2.1
+++ iconv/gconv_db.c 1999/12/08 10:39:42
@@ -284,24 +284,24 @@
#ifndef STATIC_GCONV
static int
internal_function
-increment_counter (struct __gconv_step *steps, size_t nsteps)
+increment_counter (struct gconv_step *steps, size_t nsteps)
{
/* Increment the user counter. */
size_t cnt = nsteps;
- int result = __GCONV_OK;
+ int result = GCONV_OK;
while (cnt-- > 0)
- if (steps[cnt].__counter++ == 0)
+ if (steps[cnt].counter++ == 0)
{
- steps[cnt].__shlib_handle =
- __gconv_find_shlib (steps[cnt].__modname);
- if (steps[cnt].__shlib_handle == NULL)
+ steps[cnt].shlib_handle =
+ __gconv_find_shlib (steps[cnt].modname);
+ if (steps[cnt].shlib_handle == NULL)
{
/* Oops, this is the second time we use this module (after
unloading) and this time loading failed!? */
while (++cnt < nsteps)
- __gconv_release_shlib (steps[cnt].__shlib_handle);
- result = __GCONV_NOCONV;
+ __gconv_release_shlib (steps[cnt].shlib_handle);
+ result = GCONV_NOCONV;
break;
}
}
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de
next reply other threads:[~1999-12-08 2:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-12-08 2:51 Andreas Jaeger [this message]
1999-12-08 8:52 ` Ulrich Drepper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=u8bt81emvu.fsf@gromit.rhein-neckar.de \
--to=aj@suse.de \
--cc=libc-hacker@sourceware.cygnus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).