Module Name: src
Committed By: matt
Date: Mon Dec 14 20:42:13 UTC 2009
Modified Files:
src/sys/arch/mips/include: ansi.h
Log Message:
Fix merge botch (we use 64bit times now).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/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/mips/include/ansi.h
diff -u src/sys/arch/mips/include/ansi.h:1.25 src/sys/arch/mips/include/ansi.h:1.26
--- src/sys/arch/mips/include/ansi.h:1.25 Mon Dec 14 00:46:04 2009
+++ src/sys/arch/mips/include/ansi.h Mon Dec 14 20:42:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.25 2009/12/14 00:46:04 matt Exp $ */
+/* $NetBSD: ansi.h,v 1.26 2009/12/14 20:42:12 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -51,13 +51,12 @@
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned long /* sizeof() */
#define _BSD_SSIZE_T_ long /* byte count or error */
-#define _BSD_TIME_T_ __int64_t /* time() */
#else
#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned int /* sizeof() */
#define _BSD_SSIZE_T_ int /* byte count or error */
-#define _BSD_TIME_T_ long /* time() */
#endif /* !__mips_o32 */
+#define _BSD_TIME_T_ __int64_t /* time() */
#if __GNUC_PREREQ__(3, 0)
#define _BSD_VA_LIST_ __builtin_va_list /* GCC builtin type */
#else
