diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-07-21 16:35:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-07-21 16:35:30 +0000 |
| commit | 84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989 (patch) | |
| tree | df875f8daf13089f5402c2044c91cddec5214e25 | |
| parent | 4cdc0a3d636921357ff1ccfe02f88b9d4e974b4f (diff) | |
| download | glibc-84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989.tar.gz glibc-84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989.tar.xz glibc-84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989.zip | |
[BZ #276]
Update. 2004-07-21 Ulrich Drepper <drepper@redhat.com> * intl/libintl.h: Don't define macros for C++. Patch by Goto Masanori. 2004-07-22 GOTO Masanori <gotom@debian.or.jp> [BZ #276] * include/arpa/inet.h: Change inet_aton type from in_addr_t to int. * inet/arpa/inet.h: Likewise. * resolv/inet_addr.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list: Add semtimedop.
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | intl/libintl.h | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a9542ceffa..a4c8bf8281 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,18 @@ +2004-07-21 Ulrich Drepper <drepper@redhat.com> + + * intl/libintl.h: Don't define macros for C++. + Patch by Goto Masanori. + +2004-07-22 GOTO Masanori <gotom@debian.or.jp> + + [BZ #276] + * include/arpa/inet.h: Change inet_aton type from in_addr_t to int. + * inet/arpa/inet.h: Likewise. + * resolv/inet_addr.c: Likewise. + 2004-07-21 Alexandre Oliva <aoliva@redhat.com> - * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list: Add - semtimedop. + * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list: Add semtimedop. 2004-07-20 Roland McGrath <roland@redhat.com> @@ -13,7 +24,6 @@ (libc_config_ok): New variable, set to no. If an add-on fragment sets it to yes, skip the tuple sanity check as if --enable-hacker-mode. (sysnames): Try appending add-on names after machine as well. - * configure: Regenerated. * config.make.in (add-ons): Set from @add_ons@ instead of @subdirs@. * Makeconfig ($(common-objpfx)config.status): Also depend on configure files in $(add_ons) dirs. @@ -55,7 +65,6 @@ Likewise. * sysdeps/unix/sysv/linux/mips/configure.in (asm-unistd.h): Likewise. - * sysdeps/unix/sysv/linux/mips/configure: Rebuilt. * sysdeps/mips/dl-machine.h (__dl_runtime_resolve): Update to use _dl_lookup_symbol_x. diff --git a/intl/libintl.h b/intl/libintl.h index 89db38f3b1..6561c78370 100644 --- a/intl/libintl.h +++ b/intl/libintl.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is derived from the file libgettext.h in the GNU gettext package. @@ -92,7 +92,7 @@ extern char *bind_textdomain_codeset (__const char *__domainname, /* Optimized version of the function above. */ -#if defined __OPTIMIZE__ +#if defined __OPTIMIZE__ && !defined __cplusplus /* We need NULL for `gettext'. */ # define __need_NULL |