From: Bruno Haible <bruno@clisp.org>
Date: Sun, 30 Aug 2009 16:19:49 +0000 (+0200)
Subject: Fix today's commit.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6555032ce1d744fe2f04f0299f89cf0995581d2a;p=pspp

Fix today's commit.
---

diff --git a/ChangeLog b/ChangeLog
index 17549e271f..c0d7d5c9ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@
 
 	Work around iconv_open problem on Solaris.
 	* lib/iconv_open-solaris.gperf: New file.
+	* lib/iconv_open.c (ICONV_FLAVOR_SOLARIS): New macro.
 	* m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN): Also handle Solaris.
 	* modules/iconv_open (Files): Add lib/iconv_open-solaris.gperf.
 	(Makefile.am): Add rule for iconv_open-solaris.h. Augment
diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index f1d61b9212..664b705ec6 100644
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009 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
@@ -36,6 +36,7 @@
 #define ICONV_FLAVOR_HPUX "iconv_open-hpux.h"
 #define ICONV_FLAVOR_IRIX "iconv_open-irix.h"
 #define ICONV_FLAVOR_OSF "iconv_open-osf.h"
+#define ICONV_FLAVOR_SOLARIS "iconv_open-solaris.h"
 
 #ifdef ICONV_FLAVOR
 # include ICONV_FLAVOR