[Midnightbsd-cvs] src [9704] fix build with new iconv changes

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Dec 18 12:08:11 EST 2017


Revision: 9704
          http://svnweb.midnightbsd.org/src/?rev=9704
Author:   laffer1
Date:     2017-12-18 12:08:10 -0500 (Mon, 18 Dec 2017)
Log Message:
-----------
fix build with new iconv changes

Modified Paths:
--------------
    trunk/bin/csh/config.h
    trunk/bin/csh/iconv_stub.c
    trunk/bin/csh/iconv_stub.h

Property Changed:
----------------
    trunk/bin/csh/iconv_stub.h

Modified: trunk/bin/csh/config.h
===================================================================
--- trunk/bin/csh/config.h	2017-12-17 17:12:12 UTC (rev 9703)
+++ trunk/bin/csh/config.h	2017-12-18 17:08:10 UTC (rev 9704)
@@ -198,7 +198,7 @@
 #define HAVE_WCWIDTH 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Support NLS. */
 #define NLS 1

Modified: trunk/bin/csh/iconv_stub.c
===================================================================
--- trunk/bin/csh/iconv_stub.c	2017-12-17 17:12:12 UTC (rev 9703)
+++ trunk/bin/csh/iconv_stub.c	2017-12-18 17:08:10 UTC (rev 9704)
@@ -24,6 +24,7 @@
  * SUCH DAMAGE.
  *
  * $MidnightBSD$
+ * $FreeBSD: stable/10/bin/csh/iconv_stub.c 297585 2016-04-05 14:41:34Z ume $
  */
 
 #include <dlfcn.h>
@@ -36,9 +37,9 @@
 #undef iconv_close
 
 #define ICONVLIB	"libiconv.so"
-#define ICONV_ENGINE	"iconv"
-#define ICONV_OPEN	"iconv_open"
-#define ICONV_CLOSE	"iconv_close"
+#define ICONV_ENGINE	"libiconv"
+#define ICONV_OPEN	"libiconv_open"
+#define ICONV_CLOSE	"libiconv_close"
 
 typedef iconv_t iconv_open_t(const char *, const char *);
 

Modified: trunk/bin/csh/iconv_stub.h
===================================================================
--- trunk/bin/csh/iconv_stub.h	2017-12-17 17:12:12 UTC (rev 9703)
+++ trunk/bin/csh/iconv_stub.h	2017-12-18 17:08:10 UTC (rev 9704)
@@ -23,7 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: release/9.2.0/bin/csh/iconv_stub.h 219061 2011-02-26 18:54:54Z ume $
+ * $MidnightBSD$
+ * $FreeBSD: stable/10/bin/csh/iconv_stub.h 282275 2015-04-30 16:08:47Z tijl $
  */
 
 #ifndef _ICONV_H_
@@ -30,7 +31,7 @@
 #define _ICONV_H_
 
 typedef void *iconv_t;
-typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *);
+typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *);
 typedef int dl_iconv_close_t(iconv_t);
 
 extern iconv_t dl_iconv_open(const char *, const char *);


Property changes on: trunk/bin/csh/iconv_stub.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list