From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Jaeger To: GNU libc hacker Subject: [Patch] Current glibc 2.1.3 doesn't build: gconv_db broken Date: Wed, 08 Dec 1999 02:51:00 -0000 Message-id: X-SW-Source: 1999-12/msg00021.html The last backported patch from 2.2 for gconv_db is broken. I'm appending the trivial fix. Andreas 1999-12-08 Andreas Jaeger * 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