[prev in list] [next in list] [prev in thread] [next in thread] 

List:       snort-devel
Subject:    [Snort-devel] Re: Bad lines in config.h.in
From:       Martin Roesch <roesch () sourcefire ! com>
Date:       2001-06-23 15:28:24
[Download RAW message or body]

Oops, that happens every once in a while when I have a bad merge here,
I'll fix it...

     -Marty

Chris Martin wrote:
> 
> I have just done a CVS update and the compile has failed because
> config.h.in has the following lines in it:
> 
>     #undef WORDS_BIGENDIAN
> 
>     <<<<<<< config.h.in
>     /* $Id: acconfig.h,v 1.6 2001/03/26 19:42:51 fygrave Exp $ */
>     =======
>     /* $Id: config.h.in,v 1.103 2001/06/22 14:44:26 roesch Exp $ */
>     >>>>>>> 1.103
>     #undef PACKAGE
> 
> When the lines
> 
>      <<<<<<< config.h.in
> 
>     =======
> 
> and
> 
>      >>>>>>> 1.103
> 
> are removed, the compilation runs OK.

--
Martin Roesch
roesch@sourcefire.com
http://www.sourcefire.com - http://www.snort.org

_______________________________________________
Snort-devel mailing list
Snort-devel@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/snort-devel

[prev in list] [next in list] [prev in thread] [next in thread]