summaryrefslogtreecommitdiff
path: root/intl/libintl.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-07-21 16:35:30 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-21 16:35:30 +0000
commit84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989 (patch)
treedf875f8daf13089f5402c2044c91cddec5214e25 /intl/libintl.h
parent4cdc0a3d636921357ff1ccfe02f88b9d4e974b4f (diff)
downloadglibc-84b5ba7ecf85e45792d1571c2b29a8f2dbf1c989.tar.gz
[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.
Diffstat (limited to 'intl/libintl.h')
-rw-r--r--intl/libintl.h4
1 files changed, 2 insertions, 2 deletions
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