Mercurial > hg > octave-lyh > gnulib-hg
changeset 9906:09359378ead6
Avoid warning on EMX.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 13 Apr 2008 12:57:48 +0200 |
parents | f2fd1d89ec4b |
children | be905220886f |
files | ChangeLog lib/localcharset.c |
diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ -2008-04-12 Bruno Haible <bruno@clisp.org> +2008-04-13 Bruno Haible <bruno@clisp.org> + + * lib/localcharset.c (OS2): Don't redefine if already defined. + Reported by Elbert Pol <e.pol@chello.nl>. + +2008-04-13 Bruno Haible <bruno@clisp.org> * lib/binary-io.h [__EMX__]: Include <io.h>. + Reported by Elbert Pol <e.pol@chello.nl>. 2008-04-12 Bruno Haible <bruno@clisp.org>
--- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,7 +34,9 @@ #if defined __EMX__ /* Assume EMX program runs on OS/2, even if compiled under DOS. */ -# define OS2 +# ifndef OS2 +# define OS2 +# endif #endif #if !defined WIN32_NATIVE