Module Name: src
Committed By: maya
Date: Tue Nov 6 16:26:44 UTC 2018
Modified Files:
src/sys/sys: stdint.h types.h
Log Message:
Guard from type redefinition (needed by pre-C11 C) in a safer way.
The existing way causes problems like:
https://mail-index.netbsd.org/tech-pkg/2018/10/25/msg020395.html
https://mail-index.netbsd.org/tech-userlevel/2018/09/08/msg011381.html
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/stdint.h
cvs rdiff -u -r1.101 -r1.102 src/sys/sys/types.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/sys/stdint.h
diff -u src/sys/sys/stdint.h:1.7 src/sys/sys/stdint.h:1.8
--- src/sys/sys/stdint.h:1.7 Mon Apr 22 21:26:48 2013
+++ src/sys/sys/stdint.h Tue Nov 6 16:26:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: stdint.h,v 1.7 2013/04/22 21:26:48 joerg Exp $ */
+/* $NetBSD: stdint.h,v 1.8 2018/11/06 16:26:44 maya Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -35,54 +35,54 @@
#include <sys/cdefs.h>
#include <machine/int_types.h>
-#ifndef int8_t
+#ifndef _BSD_INT8_T_
typedef __int8_t int8_t;
-#define int8_t __int8_t
+#define _BSD_INT8_T_
#endif
-#ifndef uint8_t
+#ifndef _BSD_UINT8_T_
typedef __uint8_t uint8_t;
-#define uint8_t __uint8_t
+#define _BSD_UINT8_T_
#endif
-#ifndef int16_t
+#ifndef _BSD_INT16_T_
typedef __int16_t int16_t;
-#define int16_t __int16_t
+#define _BSD_INT16_T_
#endif
-#ifndef uint16_t
+#ifndef _BSD_UINT16_T_
typedef __uint16_t uint16_t;
-#define uint16_t __uint16_t
+#define _BSD_UINT16_T_
#endif
-#ifndef int32_t
+#ifndef _BSD_INT32_T_
typedef __int32_t int32_t;
-#define int32_t __int32_t
+#define _BSD_INT32_T_
#endif
-#ifndef uint32_t
+#ifndef _BSD_UINT32_T_
typedef __uint32_t uint32_t;
-#define uint32_t __uint32_t
+#define _BSD_UINT32_T_
#endif
-#ifndef int64_t
+#ifndef _BSD_INT64_T_
typedef __int64_t int64_t;
-#define int64_t __int64_t
+#define _BSD_INT64_T_
#endif
-#ifndef uint64_t
+#ifndef _BSD_UINT64_T_
typedef __uint64_t uint64_t;
-#define uint64_t __uint64_t
+#define _BSD_UINT64_T_
#endif
-#ifndef intptr_t
+#ifndef _BSD_INTPTR_T_
typedef __intptr_t intptr_t;
-#define intptr_t __intptr_t
+#define _BSD_INTPTR_T_
#endif
-#ifndef uintptr_t
+#ifndef _BSD_UINTPTR_T_
typedef __uintptr_t uintptr_t;
-#define uintptr_t __uintptr_t
+#define _BSD_UINTPTR_T_
#endif
#include <machine/int_mwgwtypes.h>
Index: src/sys/sys/types.h
diff -u src/sys/sys/types.h:1.101 src/sys/sys/types.h:1.102
--- src/sys/sys/types.h:1.101 Tue Jul 10 07:40:42 2018
+++ src/sys/sys/types.h Tue Nov 6 16:26:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.101 2018/07/10 07:40:42 martin Exp $ */
+/* $NetBSD: types.h,v 1.102 2018/11/06 16:26:44 maya Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -50,44 +50,44 @@
#include <sys/ansi.h>
-#ifndef int8_t
+#ifndef _BSD_INT8_T_
typedef __int8_t int8_t;
-#define int8_t __int8_t
+#define _BSD_INT8_T_
#endif
-#ifndef uint8_t
+#ifndef _BSD_UINT8_T_
typedef __uint8_t uint8_t;
-#define uint8_t __uint8_t
+#define _BSD_UINT8_T_
#endif
-#ifndef int16_t
+#ifndef _BSD_INT16_T_
typedef __int16_t int16_t;
-#define int16_t __int16_t
+#define _BSD_INT16_T_
#endif
-#ifndef uint16_t
+#ifndef _BSD_UINT16_T_
typedef __uint16_t uint16_t;
-#define uint16_t __uint16_t
+#define _BSD_UINT16_T_
#endif
-#ifndef int32_t
+#ifndef _BSD_INT32_T_
typedef __int32_t int32_t;
-#define int32_t __int32_t
+#define _BSD_INT32_T_
#endif
-#ifndef uint32_t
+#ifndef _BSD_UINT32_T_
typedef __uint32_t uint32_t;
-#define uint32_t __uint32_t
+#define _BSD_UINT32_T_
#endif
-#ifndef int64_t
+#ifndef _BSD_INT64_T_
typedef __int64_t int64_t;
-#define int64_t __int64_t
+#define _BSD_INT64_T_
#endif
-#ifndef uint64_t
+#ifndef _BSD_UINT64_T_
typedef __uint64_t uint64_t;
-#define uint64_t __uint64_t
+#define _BSD_UINT64_T_
#endif
typedef uint8_t u_int8_t;
