Module Name: src
Committed By: matt
Date: Thu Jan 24 10:18:41 UTC 2013
Modified Files:
src/sys/arch/arm/include: ansi.h
Log Message:
Use __{PTRDIFF,SIZE,WCHAR,WINT}_TYPE__ is they are defined.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/ansi.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/arm/include/ansi.h
diff -u src/sys/arch/arm/include/ansi.h:1.13 src/sys/arch/arm/include/ansi.h:1.14
--- src/sys/arch/arm/include/ansi.h:1.13 Sun Jul 17 20:54:37 2011
+++ src/sys/arch/arm/include/ansi.h Thu Jan 24 10:18:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.13 2011/07/17 20:54:37 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.14 2013/01/24 10:18:41 matt Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -48,15 +48,31 @@
* #endif
*/
#define _BSD_CLOCK_T_ unsigned int /* clock() */
+#ifdef __PTRDIFF_TYPE__
+#define _BSD_PTRDIFF_T_ __PTRDIFF_TYPE__ /* ptr1 - ptr2 */
+#else
#define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */
+#endif
+#ifdef __SIZE_TYPE__
+#define _BSD_SIZE_T_ __SIZE_TYPE__ /* sizeof() */
+#else
#define _BSD_SIZE_T_ unsigned long int /* sizeof() */
-#define _BSD_SSIZE_T_ long int /* byte count or error */
+#endif
+#define _BSD_SSIZE_T_ _BSD_PTRDIFF_T_ /* byte count or error */
#define _BSD_TIME_T_ __int64_t /* time() */
#define _BSD_CLOCKID_T_ int /* clockid_t */
#define _BSD_TIMER_T_ int /* timer_t */
#define _BSD_SUSECONDS_T_ int /* suseconds_t */
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
+#ifdef __WCHAR_TYPE__
+#define _BSD_WCHAR_T_ __WCHAR_TYPE__ /* wchar_t */
+#else
#define _BSD_WCHAR_T_ int /* wchar_t */
+#endif
+#ifdef __WINT_TYPE__
+#define _BSD_WINT_T_ __WINT_TYPE__ /* wint_t */
+#else
#define _BSD_WINT_T_ int /* wint_t */
+#endif
#endif /* _ANSI_H_ */
