X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funicodeio.c;h=42f467c31d401cc3723b662ff3e02a6a3172f134;hb=5912e24cb503d5238ab9180b98f0215e871a6abc;hp=30fbb2afd33072ddad6eea23351f78d64c65f556;hpb=d0723a1652f9f002aa800cd618fd52717b980b18;p=gnulib.git

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 30fbb2afd..42f467c31 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
@@ -29,11 +29,7 @@
 #include "unicodeio.h"
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #include <errno.h>
 #ifndef errno
@@ -186,7 +182,7 @@ unicode_to_mb (unsigned int code,
          )
 	return failure (code, NULL, callback_arg);
 
-      /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
+      /* Avoid glibc-2.1 bug and Solaris 7 bug.  */
 # if defined _LIBICONV_VERSION \
     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)