summaryrefslogtreecommitdiffstats
path: root/lib/libedit/sys.h
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2016-03-06 21:32:54 +0000
committerpfg <pfg@FreeBSD.org>2016-03-06 21:32:54 +0000
commit6f5b3c1fa3e9554a26cbf6401366ff8b0f0506fe (patch)
treed0cf340e5e8da21b579217126ee95772c2a99baf /lib/libedit/sys.h
parent6e035b81175ff50ed064a8dd1d5bf9100b0d0711 (diff)
downloadFreeBSD-src-6f5b3c1fa3e9554a26cbf6401366ff8b0f0506fe.zip
FreeBSD-src-6f5b3c1fa3e9554a26cbf6401366ff8b0f0506fe.tar.gz
Revert r296175
Undo update of libedit 2016-02-27 Something in libedit appears to be causing breakage in lldb38. The changes are not generally huge but they are suficient to to justify reverting for now. Reported by: novel, bapt
Diffstat (limited to 'lib/libedit/sys.h')
-rw-r--r--lib/libedit/sys.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index 3807c95..d005ffd 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.23 2016/02/17 19:47:49 christos Exp $ */
+/* $NetBSD: sys.h,v 1.17 2011/09/28 14:08:04 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
# define __END_DECLS
# endif
#endif
-
+
#ifndef public
# define public /* Externally visible functions/variables */
#endif
@@ -88,9 +88,14 @@ size_t strlcat(char *dst, const char *src, size_t size);
size_t strlcpy(char *dst, const char *src, size_t size);
#endif
-#ifndef HAVE_GETLINE
-#define getline libedit_getline
-ssize_t getline(char **line, size_t *len, FILE *fp);
+#ifndef HAVE_FGETLN
+#define fgetln libedit_fgetln
+char *fgetln(FILE *fp, size_t *len);
+#endif
+
+#ifndef HAVE_WCSDUP
+#include <wchar.h>
+wchar_t *wcsdup(const wchar_t *);
#endif
#ifndef _DIAGASSERT
@@ -105,18 +110,13 @@ ssize_t getline(char **line, size_t *len, FILE *fp);
typedef unsigned int u_int32_t;
#endif
-#ifndef HAVE_SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
+#ifndef SIZE_T_MAX
+#define SIZE_T_MAX ((size_t)-1)
#endif
#define REGEX /* Use POSIX.2 regular expression functions */
#undef REGEXP /* Use UNIX V8 regular expression functions */
-#ifndef WIDECHAR
-#define setlocale(c, l) /*LINTED*/NULL
-#define nl_langinfo(i) ""
-#endif
-
#if defined(__sun)
extern int tgetent(char *, const char *);
extern int tgetflag(char *);
OpenPOWER on IntegriCloud