diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 03:10:29 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 03:10:29 +0000 |
commit | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (patch) | |
tree | 8d1f20c152e2eec919c58e3259a20cc038b5d7c4 /include/libintl.h | |
parent | 8c325ee38bf779dc5d51e41281d3b8230c3af971 (diff) | |
download | uClibc-alpine-164a928b77f596b6617a4bbf43a2c06bc35a5602.tar.bz2 uClibc-alpine-164a928b77f596b6617a4bbf43a2c06bc35a5602.tar.xz |
Merge from trunk.
Diffstat (limited to 'include/libintl.h')
-rw-r--r-- | include/libintl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libintl.h b/include/libintl.h index 1ba9d0d8c..fd009c3d6 100644 --- a/include/libintl.h +++ b/include/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. @@ -97,7 +97,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 |