Regression Bug 2608: Build broken by Linux basename() implementation.

diff --git a/ChangeLog b/ChangeLog
index 07ac837abf365622242da1580d0ebfc1873b3926..6812da7be316c393736f491c5c22b2e86e81eb6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-Changes to squid-3.1.0.6 (01 Mar 2009):
+Changes to squid-3.1.0.6 (02 Mar 2009):
 
        - Regresion Fix: Support HTTP/0.9 in accelerator mode
+       - Regression bug 2608: Build broken by Linux basename() implementation.
        - Bug 2601: Hack. Convert IPv4 netmasks to CIDR in IPv6-enabled mode
        - Bug 2593: Compile errors on Solaris 10
        - Bug 2591: adaptation_access does not work

diff --git a/src/Debug.h b/src/Debug.h
index f9cec79b0b8d658450e81f78fe70f3b1335b5d62..96a78355e9aa28929571f5e0117865c6f55dc8d5 100644 (file)
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -34,12 +34,6 @@
 #ifndef SQUID_DEBUG_H
 #define SQUID_DEBUG_H
 
-/* NP: done without pre-requisite config.h  */
-/*     because we only define with it here. */
-#if HAVE_LIBGEN_H  
-#include <libgen.h>
-#endif
-
 #include <iostream>
 #undef assert
 #include <sstream>
@@ -100,7 +94,7 @@ extern FILE *debug_log;
  *
  * debugs(1,2, HERE << "some message");
  */
-#define HERE basename(__FILE__)<<"("<<__LINE__<<") "<<__FUNCTION__<<": "
+#define HERE __FILE__<<"("<<__LINE__<<") "<<__FUNCTION__<<": "
 
 /*
  * MYNAME is for use at debug levels 0 and 1 where HERE is too messy.