[src/trunk]: src/lib/libedit OpenBSD readline.c rev. 1.14 2015/02/06 23:21:58...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e5baff1922bf
branches:  trunk
changeset: 343595:e5baff1922bf
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 15 22:48:59 2016 +0000

description:
OpenBSD readline.c rev. 1.14 2015/02/06 23:21:58 millert
use SIZE_MAX

diffstat:

 lib/libedit/config.h   |  3 +++
 lib/libedit/readline.c |  7 ++++---
 lib/libedit/sys.h      |  6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r e6be7946733a -r e5baff1922bf lib/libedit/config.h
--- a/lib/libedit/config.h      Mon Feb 15 22:37:54 2016 +0000
+++ b/lib/libedit/config.h      Mon Feb 15 22:48:59 2016 +0000
@@ -256,6 +256,9 @@
 /* Version number of package */
 #define VERSION "3.0"
 
+/* Define to 1 if the system provides the SIZE_MAX constant */
+#define HAVE_SIZE_MAX  1
+
 /* Define to 1 if you want wide-character code */
 /* #undef WIDECHAR */
 
diff -r e6be7946733a -r e5baff1922bf lib/libedit/readline.c
--- a/lib/libedit/readline.c    Mon Feb 15 22:37:54 2016 +0000
+++ b/lib/libedit/readline.c    Mon Feb 15 22:48:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.c,v 1.118 2016/02/15 21:58:37 christos Exp $  */
+/*     $NetBSD: readline.c,v 1.119 2016/02/15 22:48:59 christos Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,12 +31,13 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.118 2016/02/15 21:58:37 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.119 2016/02/15 22:48:59 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
@@ -2201,7 +2202,7 @@
        }
        qsort(&list[1], len - 1, sizeof(*list),
            (int (*)(const void *, const void *)) strcmp);
-       min = SIZE_T_MAX;
+       min = SIZE_MAX;
        for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
                b = list[i + 1];
                for (j = 0; a[j] && a[j] == b[j]; j++)
diff -r e6be7946733a -r e5baff1922bf lib/libedit/sys.h
--- a/lib/libedit/sys.h Mon Feb 15 22:37:54 2016 +0000
+++ b/lib/libedit/sys.h Mon Feb 15 22:48:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys.h,v 1.20 2016/02/15 17:35:39 christos Exp $        */
+/*     $NetBSD: sys.h,v 1.21 2016/02/15 22:48:59 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -109,8 +109,8 @@
 typedef unsigned int   u_int32_t;
 #endif
 
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX     ((size_t)-1)
+#ifndef HAVE_SIZE_MAX
+#define SIZE_MAX       ((size_t)-1)
 #endif
 
 #define        REGEX           /* Use POSIX.2 regular expression functions */