--------------------- PatchSet 4564 Date: 2007/05/16 13:38:18 Author: adri Branch: squid3_logdaemon Tag: (none) Log: Restore the conditional compilation directives, C style, for the SYSLOG code. Members: src/LogFileOpen.cc:1.1.2.3->1.1.2.4 src/LogFileSyslog.cc:1.1.2.5->1.1.2.6 src/LogFileSyslog.h:1.1.2.4->1.1.2.5 Index: squid3/src/LogFileOpen.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/LogFileOpen.cc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/src/LogFileOpen.cc 16 May 2007 13:28:27 -0000 1.1.2.3 +++ squid3/src/LogFileOpen.cc 16 May 2007 13:38:18 -0000 1.1.2.4 @@ -6,13 +6,16 @@ * Please include the names of authors of any patches made to this * file. * - * $Id: LogFileOpen.cc,v 1.1.2.3 2007/05/16 13:28:27 adri Exp $ + * $Id: LogFileOpen.cc,v 1.1.2.4 2007/05/16 13:38:18 adri Exp $ */ #include "squid.h" #include "LogFile.h" #include "LogFileBlocking.h" + +#if HAVE_SYSLOG #include "LogFileSyslog.h" +#endif Core::LogFile * LogFileOpen(const char *path, int buf_sz, bool do_fatal) Index: squid3/src/LogFileSyslog.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/LogFileSyslog.cc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid3/src/LogFileSyslog.cc 16 May 2007 13:27:48 -0000 1.1.2.5 +++ squid3/src/LogFileSyslog.cc 16 May 2007 13:38:18 -0000 1.1.2.6 @@ -1,5 +1,5 @@ /* - * $Id: LogFileSyslog.cc,v 1.1.2.5 2007/05/16 13:27:48 adri Exp $ + * $Id: LogFileSyslog.cc,v 1.1.2.6 2007/05/16 13:38:18 adri Exp $ * * DEBUG: section 50 Log file handling * AUTHOR: Adrian Chadd @@ -14,6 +14,9 @@ */ #include "squid.h" + +#if HAVE_SYSLOG + #include "authenticate.h" #include "fde.h" @@ -126,3 +129,5 @@ } } + +#endif /* HAVE_SYSLOG */ Index: squid3/src/LogFileSyslog.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/LogFileSyslog.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/src/LogFileSyslog.h 16 May 2007 03:50:51 -0000 1.1.2.4 +++ squid3/src/LogFileSyslog.h 16 May 2007 13:38:18 -0000 1.1.2.5 @@ -7,6 +7,8 @@ * $INCLUDE GPLv2 */ +#if HAVE_SYSLOG + namespace Core { /* @@ -42,4 +44,5 @@ }; +#endif /* HAVE_SYSLOG */ #endif