head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.34
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.32
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.30
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.28
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.26
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.24
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.22
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.20
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.18
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.16
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.14
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.12
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.10
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.8
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.6
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.4
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.2
	pkgsrc-2022Q1-base:1.2;
locks; strict;
comment	@// @;


1.2
date	2022.03.15.20.16.49;	author nia;	state Exp;
branches;
next	1.1;
commitid	uyeTvdpzqzlLSlwD;

1.1
date	2022.03.07.16.37.52;	author nia;	state Exp;
branches;
next	;
commitid	KH8lAetRnEsyVivD;


desc
@@


1.2
log
@dosbox-x: properly fix non-posix iconv case
@
text
@$NetBSD: patch-include_iconvpp.hpp,v 1.1 2022/03/07 16:37:52 nia Exp $

Support NetBSD 9.x and earlier.

--- include/iconvpp.hpp.orig	2022-03-15 18:04:18.609036525 +0000
+++ include/iconvpp.hpp
@@@@ -31,6 +31,15 @@@@
 # define ICONV_BIG_ENDIAN BIG_ENDIAN
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Prereq__(9,99,17)
+#define NETBSD_POSIX_ICONV 1
+#else
+#define NETBSD_POSIX_ICONV 0
+#endif
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@@@ -247,7 +256,11 @@@@ public:
             iconv(context,NULL,NULL,NULL,NULL);
 
             /* Ref: [http://man7.org/linux/man-pages/man3/iconv.3.html] */
+#if defined(__sun) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV)
+            int ret = iconv(context,(const char **)(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
+#else
             int ret = iconv(context,(char**)(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
+#endif
 
             pclass::src_adv = (size_t)(pclass::src_ptr - i_src);
             pclass::dst_adv = (size_t)(pclass::dst_ptr - i_dst);
@


1.1
log
@dosbox-x: do not lose constness of iconv arg on netbsd prior to current
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- include/iconvpp.hpp.orig	2022-03-07 16:24:10.486063951 +0000
d27 2
a28 2
+#if defined(__sun) || (defined(__NetBSD__) && !defined(NETBSD_POSIX_ICONV))
+            int ret = iconv(context,(&(pclass::src_ptr)),&src_left,(char**)(&(pclass::dst_ptr)),&dst_left);
@