Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Dec 2002 17:55:00 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 21785 for review
Message-ID:  <200212020155.gB21t0wp097415@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21785

Change 21785 by peter@peter_daintree on 2002/12/01 17:54:34

	mismerge

Affected files ...

.. //depot/projects/ia64/lib/libutil/logout.c#4 edit
.. //depot/projects/ia64/lib/libutil/logwtmp.c#5 edit

Differences ...

==== //depot/projects/ia64/lib/libutil/logout.c#4 (text+ko) ====

@@ -50,7 +50,6 @@
 #include <string.h>
 #include <timeconv.h>
 #include <libutil.h>
-#include <timeconv.h>
 
 typedef struct utmp UTMP;
 

==== //depot/projects/ia64/lib/libutil/logwtmp.c#5 (text+ko) ====

@@ -53,7 +53,6 @@
 #include <timeconv.h>
 #include <unistd.h>
 #include <utmp.h>
-#include <timeconv.h>
 
 /* wrapper for KAME-special getnameinfo() */
 #ifndef NI_WITHSCOPEID

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212020155.gB21t0wp097415>