--------------------- PatchSet 9375 Date: 2007/05/18 19:13:12 Author: serassio Branch: s26_logfile_daemon Tag: (none) Log: Allow build on systems without syslog facility Members: src/logfile.c:1.12.2.15->1.12.2.16 src/logfile_mod_syslog.c:1.1.2.4->1.1.2.5 Index: squid/src/logfile.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/logfile.c,v retrieving revision 1.12.2.15 retrieving revision 1.12.2.16 diff -u -r1.12.2.15 -r1.12.2.16 --- squid/src/logfile.c 15 May 2007 01:38:31 -0000 1.12.2.15 +++ squid/src/logfile.c 18 May 2007 19:13:12 -0000 1.12.2.16 @@ -35,7 +35,9 @@ #include "squid.h" #include "logfile_mod_daemon.h" +#if HAVE_SYSLOG #include "logfile_mod_syslog.h" +#endif #include "logfile_mod_stdio.h" /* External code */ @@ -57,8 +59,10 @@ ret = logfile_mod_stdio_open(lf, path, bufsz, fatal_flag); } else if (strcmp(type, "daemon") == 0) { ret = logfile_mod_daemon_open(lf, path, bufsz, fatal_flag); +#if HAVE_SYSLOG } else if (strcmp(type, "syslog") == 0) { ret = logfile_mod_syslog_open(lf, path, bufsz, fatal_flag); +#endif } else { fatalf("logfileOpen: unknown logtype '%s'\n", type); } Index: squid/src/logfile_mod_syslog.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/logfile_mod_syslog.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/src/logfile_mod_syslog.c 15 May 2007 01:38:31 -0000 1.1.2.4 +++ squid/src/logfile_mod_syslog.c 18 May 2007 19:13:12 -0000 1.1.2.5 @@ -1,5 +1,5 @@ /* - * $Id: logfile_mod_syslog.c,v 1.1.2.4 2007/05/15 01:38:31 hno Exp $ + * $Id: logfile_mod_syslog.c,v 1.1.2.5 2007/05/18 19:13:12 serassio Exp $ * * DEBUG: section 50 Log file handling * AUTHOR: Duane Wessels @@ -33,6 +33,7 @@ */ #include "squid.h" +#if HAVE_SYSLOG #include "logfile_mod_syslog.h" /* Define LOG_AUTHPRIV as LOG_AUTH on systems still using the old deprecated LOG_AUTH */ @@ -183,4 +184,4 @@ return 1; } - +#endif