From 84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 21 Jul 2004 16:35:30 +0000 Subject: [BZ #276] Update. 2004-07-21 Ulrich Drepper * intl/libintl.h: Don't define macros for C++. Patch by Goto Masanori. 2004-07-22 GOTO Masanori [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. --- intl/libintl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intl') diff --git a/intl/libintl.h b/intl/libintl.h index 89db38f..6561c78 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 -- cgit v1.1