diff options
| author | dim <dim@FreeBSD.org> | 2010-10-21 19:11:14 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-10-21 19:11:14 +0000 |
| commit | 844d5c9852c83cc56dccdc017c27f2bfc0928f05 (patch) | |
| tree | 506464413c40d2c6a4a46d04892a9415cb886522 /contrib/binutils/gas/asintl.h | |
| parent | acc1b913a3297e19f9ffe7d2b7b8a3142926d3b4 (diff) | |
| parent | 0acbbeece75076693a5c54ce4d376aa9f021b4e3 (diff) | |
| download | FreeBSD-src-844d5c9852c83cc56dccdc017c27f2bfc0928f05.zip FreeBSD-src-844d5c9852c83cc56dccdc017c27f2bfc0928f05.tar.gz | |
Merge ^vendor/binutils/dist@214082 into contrib/binutils.
Diffstat (limited to 'contrib/binutils/gas/asintl.h')
| -rw-r--r-- | contrib/binutils/gas/asintl.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/contrib/binutils/gas/asintl.h b/contrib/binutils/gas/asintl.h index 41bb218..67ce0dd 100644 --- a/contrib/binutils/gas/asintl.h +++ b/contrib/binutils/gas/asintl.h @@ -1,5 +1,5 @@ /* asintl.h - gas-specific header for gettext code. - Copyright 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2005 Free Software Foundation, Inc. Written by Tom Tromey <tromey@cygnus.com> @@ -17,10 +17,19 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #ifdef HAVE_LOCALE_H +# ifndef ENABLE_NLS + /* The Solaris version of locale.h always includes libintl.h. If we have + been configured with --disable-nls then ENABLE_NLS will not be defined + and the dummy definitions of bindtextdomain (et al) below will conflict + with the defintions in libintl.h. So we define these values to prevent + the bogus inclusion of libintl.h. */ +# define _LIBINTL_H +# define _LIBGETTEXT_H +# endif # include <locale.h> #endif |
