Module Name: src
Committed By: dholland
Date: Mon Jan 21 20:28:18 UTC 2019
Modified Files:
src/sys/arch/alpha/include: limits.h
src/sys/arch/arm/include: limits.h
src/sys/arch/hppa/include: limits.h
src/sys/arch/i386/include: limits.h
src/sys/arch/ia64/include: limits.h
src/sys/arch/m68k/include: limits.h
src/sys/arch/mips/include: limits.h
src/sys/arch/powerpc/include: limits.h
src/sys/arch/sh3/include: limits.h
src/sys/arch/sparc/include: limits.h
src/sys/arch/vax/include: limits.h
Log Message:
Fix wrong scoping of {U,}LLONG_MAX. More cases, not just amd64.
PR 53298 from Roberto E. Vargas Caballero.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/limits.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/limits.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/limits.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/include/limits.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/limits.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/include/limits.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/include/limits.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/limits.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/include/limits.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/include/limits.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/include/limits.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/limits.h
diff -u src/sys/arch/alpha/include/limits.h:1.16 src/sys/arch/alpha/include/limits.h:1.17
--- src/sys/arch/alpha/include/limits.h:1.16 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/alpha/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.16 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.17 2019/01/21 20:28:17 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -64,10 +64,6 @@
#define LONG_MAX 0x7fffffffffffffffL /* max for a long */
#define LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -75,6 +71,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */
Index: src/sys/arch/arm/include/limits.h
diff -u src/sys/arch/arm/include/limits.h:1.18 src/sys/arch/arm/include/limits.h:1.19
--- src/sys/arch/arm/include/limits.h:1.18 Mon Feb 24 16:57:57 2014
+++ src/sys/arch/arm/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.18 2014/02/24 16:57:57 christos Exp $ */
+/* $NetBSD: limits.h,v 1.19 2019/01/21 20:28:17 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -60,10 +60,6 @@
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
#endif
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -71,6 +67,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */
Index: src/sys/arch/hppa/include/limits.h
diff -u src/sys/arch/hppa/include/limits.h:1.15 src/sys/arch/hppa/include/limits.h:1.16
--- src/sys/arch/hppa/include/limits.h:1.15 Thu Apr 11 00:57:34 2013
+++ src/sys/arch/hppa/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.15 2013/04/11 00:57:34 christos Exp $ */
+/* $NetBSD: limits.h,v 1.16 2019/01/21 20:28:17 dholland Exp $ */
/* $OpenBSD: limits.h,v 1.2 2000/07/31 20:06:02 millert Exp $ */
@@ -89,10 +89,6 @@
#define LONG_MAX 0x7fffffffL /* max value for a long */
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -100,6 +96,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN INT_MIN /* min value for a ssize_t */
#define SIZE_T_MAX UINT_MAX /* max value for a size_t */
Index: src/sys/arch/i386/include/limits.h
diff -u src/sys/arch/i386/include/limits.h:1.25 src/sys/arch/i386/include/limits.h:1.26
--- src/sys/arch/i386/include/limits.h:1.25 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/i386/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.25 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.26 2019/01/21 20:28:17 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -54,10 +54,6 @@
#define LONG_MAX 0x7fffffffL /* max value for a long */
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -65,6 +61,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN INT_MIN /* min value for a ssize_t */
#define SIZE_T_MAX UINT_MAX /* max value for a size_t */
Index: src/sys/arch/ia64/include/limits.h
diff -u src/sys/arch/ia64/include/limits.h:1.8 src/sys/arch/ia64/include/limits.h:1.9
--- src/sys/arch/ia64/include/limits.h:1.8 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/ia64/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.8 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.9 2019/01/21 20:28:17 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -53,10 +53,6 @@
#define LONG_MIN (-0x7fffffffffffffffL-1) /* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -64,6 +60,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */
Index: src/sys/arch/m68k/include/limits.h
diff -u src/sys/arch/m68k/include/limits.h:1.23 src/sys/arch/m68k/include/limits.h:1.24
--- src/sys/arch/m68k/include/limits.h:1.23 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/m68k/include/limits.h Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.23 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.24 2019/01/21 20:28:17 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -54,10 +54,6 @@
#define LONG_MAX 0x7fffffffL /* max value for a long */
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -65,6 +61,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN INT_MIN /* min value for a ssize_t */
#define SIZE_T_MAX UINT_MAX /* max value for a size_t */
Index: src/sys/arch/mips/include/limits.h
diff -u src/sys/arch/mips/include/limits.h:1.26 src/sys/arch/mips/include/limits.h:1.27
--- src/sys/arch/mips/include/limits.h:1.26 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/mips/include/limits.h Mon Jan 21 20:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.26 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.27 2019/01/21 20:28:18 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -70,6 +70,13 @@
#define LONG_MIN (-0x7fffffff-1) /* min value for a long */
#endif
+#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
+ defined(_NETBSD_SOURCE)
+#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
+#define LLONG_MAX 0x7fffffffffffffffLL /* max signed long long */
+#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
+#endif
+
#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
defined(_NETBSD_SOURCE)
#ifdef _LP64
@@ -78,13 +85,6 @@
#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
#endif
-#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
- defined(_NETBSD_SOURCE)
-#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
-#define LLONG_MAX 0x7fffffffffffffffLL /* max signed long long */
-#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
-#endif
-
#if defined(_NETBSD_SOURCE)
#ifdef _LP64
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
Index: src/sys/arch/powerpc/include/limits.h
diff -u src/sys/arch/powerpc/include/limits.h:1.19 src/sys/arch/powerpc/include/limits.h:1.20
--- src/sys/arch/powerpc/include/limits.h:1.19 Mon Apr 21 10:53:47 2014
+++ src/sys/arch/powerpc/include/limits.h Mon Jan 21 20:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.19 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.20 2019/01/21 20:28:18 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -70,6 +70,13 @@
#define LONG_MIN (-0x7fffffff-1) /* min value for a long */
#endif
+#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
+ defined(_NETBSD_SOURCE)
+#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
+#define LLONG_MAX 0x7fffffffffffffffLL /* max signed long long */
+#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
+#endif
+
#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
defined(_NETBSD_SOURCE)
#ifdef _LP64
@@ -78,13 +85,6 @@
#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
#endif
-#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
- defined(_NETBSD_SOURCE)
-#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
-#define LLONG_MAX 0x7fffffffffffffffLL /* max signed long long */
-#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
-#endif
-
#if defined(_NETBSD_SOURCE)
#ifdef _LP64
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
Index: src/sys/arch/sh3/include/limits.h
diff -u src/sys/arch/sh3/include/limits.h:1.14 src/sys/arch/sh3/include/limits.h:1.15
--- src/sys/arch/sh3/include/limits.h:1.14 Mon Apr 21 10:53:48 2014
+++ src/sys/arch/sh3/include/limits.h Mon Jan 21 20:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.14 2014/04/21 10:53:48 matt Exp $ */
+/* $NetBSD: limits.h,v 1.15 2019/01/21 20:28:18 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -54,10 +54,6 @@
#define LONG_MAX 0x7fffffffL /* max value for a long */
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -65,6 +61,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX INT_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN INT_MIN /* min value for a ssize_t */
#define SIZE_T_MAX UINT_MAX /* max value for a size_t */
Index: src/sys/arch/sparc/include/limits.h
diff -u src/sys/arch/sparc/include/limits.h:1.22 src/sys/arch/sparc/include/limits.h:1.23
--- src/sys/arch/sparc/include/limits.h:1.22 Mon Apr 21 10:53:48 2014
+++ src/sys/arch/sparc/include/limits.h Mon Jan 21 20:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.22 2014/04/21 10:53:48 matt Exp $ */
+/* $NetBSD: limits.h,v 1.23 2019/01/21 20:28:18 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -60,10 +60,6 @@
#define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
#endif
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -71,6 +67,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */
Index: src/sys/arch/vax/include/limits.h
diff -u src/sys/arch/vax/include/limits.h:1.20 src/sys/arch/vax/include/limits.h:1.21
--- src/sys/arch/vax/include/limits.h:1.20 Thu Apr 11 00:57:36 2013
+++ src/sys/arch/vax/include/limits.h Mon Jan 21 20:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.20 2013/04/11 00:57:36 christos Exp $ */
+/* $NetBSD: limits.h,v 1.21 2019/01/21 20:28:18 dholland Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -54,10 +54,6 @@
#define LONG_MAX 0x7fffffffL /* max value for a long */
#define LONG_MIN (-0x7fffffffL-1)/* min value for a long */
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
- defined(_NETBSD_SOURCE)
-#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
-
#if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
defined(_NETBSD_SOURCE)
#define ULLONG_MAX 0xffffffffffffffffULL /* max unsigned long long */
@@ -65,6 +61,10 @@
#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min signed long long */
#endif
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+ defined(_NETBSD_SOURCE)
+#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */
+
#if defined(_NETBSD_SOURCE)
#define SSIZE_MIN LONG_MIN /* min value for a ssize_t */
#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */
