summaryrefslogtreecommitdiffstats
path: root/sys/sys
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2015-04-30 16:08:47 +0000
committertijl <tijl@FreeBSD.org>2015-04-30 16:08:47 +0000
commitb709ec868adb5170d09bc5a66b18d0e0d5987ab6 (patch)
treec67e00b5fe571ffc8b53045db12739794a0aa566 /sys/sys
parentde0424ce2628044461b3970c30ea52cd23d4a937 (diff)
downloadFreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.zip
FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.tar.gz
MFC r275805:
Fix incorrect type of "invalids" argument in __iconv() prototype. MFC r281550,281591: Remove the const qualifier from iconv(3) to comply with POSIX: http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html Adjust all code that calls iconv. PR: 199099
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/param.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 0de800c..c891976 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1001513 /* Master, propagated to newvers */
+#define __FreeBSD_version 1001514 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
OpenPOWER on IntegriCloud