[Midnightbsd-cvs] src [6643] trunk/lib/libc/iconv: make things strict, and fix an include bug

[laffer1 at midnightbsd.org]

Revision: 6643
          http://svnweb.midnightbsd.org/src/?rev=6643
Author:   laffer1
Date:     2014-04-13 11:01:52 -0400 (Sun, 13 Apr 2014)
Log Message:
-----------
make things strict, and fix an include bug

Modified Paths:
--------------
    trunk/lib/libc/iconv/citrus_csmapper.h
    trunk/lib/libc/iconv/citrus_iconv.c

Modified: trunk/lib/libc/iconv/citrus_csmapper.h
===================================================================
--- trunk/lib/libc/iconv/citrus_csmapper.h	2014-04-12 00:42:21 UTC (rev 6642)
+++ trunk/lib/libc/iconv/citrus_csmapper.h	2014-04-13 15:01:52 UTC (rev 6643)
@@ -28,7 +28,7 @@
  */
 
 #ifndef _CITRUS_CSMAPPER_H_
-#define _CITRUS_CSMAPPER_H
+#define _CITRUS_CSMAPPER_H_
 
 #define _citrus_csmapper		_citrus_mapper
 #define _citrus_csmapper_close		_citrus_mapper_close

Modified: trunk/lib/libc/iconv/citrus_iconv.c
===================================================================
--- trunk/lib/libc/iconv/citrus_iconv.c	2014-04-12 00:42:21 UTC (rev 6642)
+++ trunk/lib/libc/iconv/citrus_iconv.c	2014-04-13 15:01:52 UTC (rev 6643)
@@ -114,20 +114,7 @@
 	size_t len_convname;
 	int ret;
 
-#ifdef INCOMPATIBLE_WITH_GNU_ICONV
-	/*
-	 * Sadly, the gnu tools expect iconv to actually parse the
-	 * byte stream and don't allow for a pass-through when
-	 * the (src,dest) encodings are the same.
-	 * See gettext-0.18.3+ NEWS:
-	 *   msgfmt now checks PO file headers more strictly with less
-	 *   false-positives.
-	 * NetBSD don't do this either.
-	 */
  	module = (strcmp(src, dst) != 0) ? "iconv_std" : "iconv_none";
-#else
-	module = "iconv_std";
-#endif
 
 	/* initialize iconv handle */
 	len_convname = strlen(convname);