Module Name: src
Committed By: martin
Date: Thu Aug 14 11:28:13 UTC 2014
Modified Files:
src/sys/arch/vax/include: int_fmtio.h mutex.h
Log Message:
Revert previous changes, gcc configuration will be adapted instead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/int_fmtio.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/include/mutex.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/vax/include/int_fmtio.h
diff -u src/sys/arch/vax/include/int_fmtio.h:1.6 src/sys/arch/vax/include/int_fmtio.h:1.7
--- src/sys/arch/vax/include/int_fmtio.h:1.6 Thu Aug 14 09:17:32 2014
+++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 14 11:28:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.6 2014/08/14 09:17:32 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.7 2014/08/14 11:28:13 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
#define PRIiFAST32 "i" /* int_fast32_t */
#define PRIiFAST64 "lli" /* int_fast64_t */
#define PRIiMAX "lli" /* intmax_t */
-#define PRIiPTR "i" /* intptr_t */
+#define PRIiPTR "li" /* intptr_t */
/* fprintf macros for unsigned integers */
@@ -101,7 +101,7 @@
#define PRIuFAST32 "u" /* uint_fast32_t */
#define PRIuFAST64 "llu" /* uint_fast64_t */
#define PRIuMAX "llu" /* uintmax_t */
-#define PRIuPTR "u" /* uintptr_t */
+#define PRIuPTR "lu" /* uintptr_t */
#define PRIx8 "x" /* uint8_t */
#define PRIx16 "x" /* uint16_t */
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.13 src/sys/arch/vax/include/mutex.h:1.14
--- src/sys/arch/vax/include/mutex.h:1.13 Thu Aug 14 09:02:18 2014
+++ src/sys/arch/vax/include/mutex.h Thu Aug 14 11:28:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.13 2014/08/14 09:02:18 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.14 2014/08/14 11:28:13 martin Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@ struct kmutex {
*/
#define MUTEX_GIVE(mtx) /* nothing */
-#define MUTEX_CAS(p, o, n) (atomic_cas_uint((p), (o), (n)) == (o))
+#define MUTEX_CAS(p, o, n) (atomic_cas_ulong((p), (o), (n)) == (o))
#endif /* __MUTEX_PRIVATE */
