Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/include Fix merge botch (we use 64bit times now).



details:   https://anonhg.NetBSD.org/src/rev/09642455ecdd
branches:  trunk
changeset: 750047:09642455ecdd
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 14 20:42:12 2009 +0000

description:
Fix merge botch (we use 64bit times now).

diffstat:

 sys/arch/mips/include/ansi.h |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 98af4ced5b67 -r 09642455ecdd sys/arch/mips/include/ansi.h
--- a/sys/arch/mips/include/ansi.h      Mon Dec 14 18:39:19 2009 +0000
+++ b/sys/arch/mips/include/ansi.h      Mon Dec 14 20:42:12 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index