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

kernel/3782: Bad lines in /usr/src/sys/netinet/tcp_var.h in OpenBSD 3.5



>Number:         3782
>Category:       kernel
>Synopsis:       Syntactically invalid lines in /usr/src/sys/netinet/tcp_var.h
>Confidential:   yes
>Severity:       serious
>Priority:       low
>Responsible:    bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   unknown
>Arrival-Date:   Fri May 14 20:30:02 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     W Howard
>Release:        3.5
>Organization:
University of Alberta
>Environment:
	System      : OpenBSD 3.5
	Architecture: OpenBSD.sparc64
	Machine     : sparc64
>Description:
	There are five copies each of lines with "<<<<<<< tcp_var.h",
        ">>>>>>> 1.61", and "=======" in the file.
        The C compiler does not like them.
        I obtained the file by "cvs update" on the morning of 14 May.
>How-To-Repeat:
	Try to make a kernel with networking.  Or edit the file.
>Fix:
	Take the lines out, or comment them out.


>Release-Note:
>Audit-Trail:
>Unformatted: