about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-04-01 05:04:31 +0000
committerRoland McGrath <roland@gnu.org>2001-04-01 05:04:31 +0000
commit8a0746ae74914cbdf02fc609e15d267692695792 (patch)
treeff39d2bacaa6ecc8896a8a42918443d4f0824f7d /iconv
parent24cf21d780e14d5a7e04257afdf67f6c7ca90f83 (diff)
downloadglibc-8a0746ae74914cbdf02fc609e15d267692695792.tar.gz
glibc-8a0746ae74914cbdf02fc609e15d267692695792.tar.xz
glibc-8a0746ae74914cbdf02fc609e15d267692695792.zip
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
	options after $(build-module), which is no longer a single command.
	(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
	(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
	variables using it.  Reported by Mark Kettenis <kettenis@gnu.org>.

2001-03-11  Roland McGrath  <roland@frob.com>

	* elf/rtld.c (dl_main): Add cast to quiet warning.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
	* iconv/gconv_conf.c (__gconv_get_path): Likewise.
	(__gconv_read_conf): Likewise.
	* iconv/gconv_db.c (gen_steps): Likewise.
	(__gconv_find_transform): Likewise.
	* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
	(fopen_uncompressed): Use const in second argument's type.

2001-03-11  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.

	* mach/mach_error.h: Fix ancient #endif syntax.
	* hurd/hurdmalloc.c: Likewise.

	* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
	compare_and_swap): Add volatile qualifier to first arg, to bring
	these prototypes in line with all the other implementations.
	Add a #warning to remind the builder that these are not atomic.

2001-03-04  Roland McGrath  <roland@frob.com>

	* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
	member of TEMP_F so its type is _IO_FILE * as expected.

	* hurd/fopenport.c (seekio): Conditionalize type of POS argument
	on [USE_IN_LIBIO].  Check the value for overflow, since for libio
	it might exceed off_t's range.

2001-02-25  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
	* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.

	* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
	macro instead of an inline function,
	(MSG_EXAMINE): Likewise.

	* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.

	* hurd/get-host.c: Include <string.h> for decls of built-ins.
	* hurd/hurdchdir.c: Likewise.
	* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
	* sysdeps/mach/hurd/opendir.c: Likewise.

	* mach/mach_init.c: Include <unistd.h> for _exit decl.

	* mach/errsystems.awk: Give output file a trailing newline.

	* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
	the script will use our compiler for the cpp stage.

	With --enable-all-warnings we get a whole bunch of warnings,
	and these are just a few fixes; there are more needed to silence it.
	* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
	decls before extern inline defns to quiet gcc warning.
	* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
	* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_conf.c6
-rw-r--r--iconv/gconv_db.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index b7e7692c89..d36a751a8c 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -1,5 +1,5 @@
 /* Handle configuration data.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -506,7 +506,7 @@ __gconv_get_path (void)
 	  result[n].len = 0;
 	}
 
-      __gconv_path_elem = result ?: &empty_path_elem;
+      __gconv_path_elem = result ?: (struct path_elem *) &empty_path_elem;
 
       if (cwd != NULL)
 	free (cwd);
@@ -552,7 +552,7 @@ __gconv_read_conf (void)
     {
       struct gconv_alias fake_alias;
 
-      fake_alias.fromname = builtin_modules[cnt].from_string;
+      fake_alias.fromname = (char *) builtin_modules[cnt].from_string;
 
       if (__tfind (&fake_alias, &__gconv_alias_db, __gconv_alias_compare)
 	  != NULL)
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index d003981d3e..c4ebc4f096 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -1,5 +1,5 @@
 /* Provide access to the collection of available transformation modules.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -225,7 +225,7 @@ gen_steps (struct derivation_step *best, const char *toset,
 	{
 	  result[step_cnt].__from_name = (step_cnt == 0
 					  ? __strdup (fromset)
-					  : current->last->result_set);
+					  : (char *)current->last->result_set);
 	  result[step_cnt].__to_name = (step_cnt + 1 == *nsteps
 					? __strdup (current->result_set)
 					: result[step_cnt + 1].__from_name);
@@ -644,11 +644,11 @@ __gconv_find_transform (const char *toset, const char *fromset,
       struct gconv_alias key;
       struct gconv_alias **found;
 
-      key.fromname = fromset;
+      key.fromname = (char *) fromset;
       found = __tfind (&key, &__gconv_alias_db, __gconv_alias_compare);
       fromset_expand = found != NULL ? (*found)->toname : NULL;
 
-      key.fromname = toset;
+      key.fromname = (char *) toset;
       found = __tfind (&key, &__gconv_alias_db, __gconv_alias_compare);
       toset_expand = found != NULL ? (*found)->toname : NULL;
     }