[Snort-devel] Bad lines in config.h.in

Chris Martin chris.martin2 at ...482...
Sat Jun 23 03:49:00 EDT 2001


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.




More information about the Snort-devel mailing list