Module Name: src
Committed By: christos
Date: Tue Feb 16 19:29:51 UTC 2016
Modified Files:
src/lib/libedit: config.h histedit.h sys.h
Log Message:
- don't set _GNU_SOURCE. We are not supposed to make decisions for others.
- don't special-case wcsdup()
>From Ingo Schwarze.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libedit/config.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libedit/histedit.h
cvs rdiff -u -r1.21 -r1.22 src/lib/libedit/sys.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/config.h
diff -u src/lib/libedit/config.h:1.7 src/lib/libedit/config.h:1.8
--- src/lib/libedit/config.h:1.7 Mon Feb 15 17:48:59 2016
+++ src/lib/libedit/config.h Tue Feb 16 14:29:51 2016
@@ -187,9 +187,6 @@
/* Define to 1 if you have the `vis' function. */
#define HAVE_VIS 1
-/* Define to 1 if you have the `wcsdup' function. */
-#define HAVE_WCSDUP 1
-
/* Define to 1 if `fork' works. */
#define HAVE_WORKING_FORK 1
Index: src/lib/libedit/histedit.h
diff -u src/lib/libedit/histedit.h:1.53 src/lib/libedit/histedit.h:1.54
--- src/lib/libedit/histedit.h:1.53 Wed Jun 18 14:12:28 2014
+++ src/lib/libedit/histedit.h Tue Feb 16 14:29:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.53 2014/06/18 18:12:28 christos Exp $ */
+/* $NetBSD: histedit.h,v 1.54 2016/02/16 19:29:51 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -249,21 +249,10 @@ int tok_str(Tokenizer *, const char *,
/*
* Begin Wide Character Support
*/
-#ifdef __linux__
-/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
#include <wchar.h>
#include <wctype.h>
/*
- * Wide character versions
- */
-
-/*
* ==== Editing ====
*/
typedef struct lineinfow {
Index: src/lib/libedit/sys.h
diff -u src/lib/libedit/sys.h:1.21 src/lib/libedit/sys.h:1.22
--- src/lib/libedit/sys.h:1.21 Mon Feb 15 17:48:59 2016
+++ src/lib/libedit/sys.h Tue Feb 16 14:29:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.21 2016/02/15 22:48:59 christos Exp $ */
+/* $NetBSD: sys.h,v 1.22 2016/02/16 19:29:51 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -92,11 +92,6 @@ size_t strlcpy(char *dst, const char *sr
ssize_t getline(char **line, size_t *len, FILE *fp);
#endif
-#ifndef HAVE_WCSDUP
-#include <wchar.h>
-wchar_t *wcsdup(const wchar_t *);
-#endif
-
#ifndef _DIAGASSERT
#define _DIAGASSERT(x)
#endif
