Guido's fixes

diff --git a/src/asn.cc b/src/asn.cc
index 8f89f7853c2121ae0c95db75a47330fbef19e3ca..098639b5f6a80d3859c0ab25f183f9dcd4ee3c6e 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: asn.cc,v 1.86 2002/10/25 07:36:32 robertc Exp $
+ * $Id: asn.cc,v 1.87 2003/01/17 08:21:51 robertc Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -153,7 +153,7 @@ asnAclInitialize(acl * acls)
 
 /* initialize the radix tree structure */
 
-extern int squid_max_keylen;   /* yuck.. this is in lib/radix.c */
+SQUIDCEXTERN int squid_max_keylen;     /* yuck.. this is in lib/radix.c */
 
 CBDATA_TYPE(ASState);
 void

diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index af94ce50066a9b6d171074db5da563007e1c1e0e..0bdf49331cc8df0699c1e2d4c711028589b5a0a6 100644 (file)
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.52 2002/12/27 10:26:39 robertc Exp $
+ * $Id: store_dir_ufs.cc,v 1.53 2003/01/17 08:21:52 robertc Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -69,7 +69,7 @@ UfsSwapDir::unlinkFile(char const *path)
 #elif USE_TRUNCATE
     truncate(path, 0);
 #else
-    unlink(path);
+    ::unlink(path);
 #endif
 }
 
@@ -683,7 +683,7 @@ UFSSwapDir::closeTmpSwapLog()
     int fd;
     file_close(swaplog_fd);
 #if defined (_SQUID_OS2_) || defined (_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_)
-    if (unlink(swaplog_path) < 0) {
+    if (::unlink(swaplog_path) < 0) {
        debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
        fatal("commonUfsDirCloseTmpSwapLog: unlink failed");
     }
@@ -892,7 +892,7 @@ UFSSwapDir::writeCleanDone()
 #if defined(_SQUID_OS2_) || defined (_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_)
        file_close(state->fd);
        state->fd = -1;
-       if (unlink(state->cur) < 0)
+       if (::unlink(state->cur) < 0)
            debug(50, 0) ("storeDirWriteCleanLogs: unlinkd failed: %s, %s\n",
                xstrerror(), state->cur);
 #endif

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 8a6db0c65460c2f7785989dbd96fba676487fe6d..a2d4e4f936fc632102e54bd6f7b5ea5ee93847d2 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.58 2002/10/21 06:43:07 adrian Exp $
+ * $Id: snmp_core.cc,v 1.59 2003/01/17 08:21:51 robertc Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -62,7 +62,7 @@ static oid *snmpCreateOid(int length,...);
 static mib_tree_entry *snmpAddNode();
 static oid *snmpCreateOid();
 #endif
-extern void (*snmplib_debug_hook) (int, char *);
+SQUIDCEXTERN void (*snmplib_debug_hook) (int, char *);
 static oid *static_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
 static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
 static oid *peer_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);

diff --git a/src/tools.cc b/src/tools.cc
index 96a9173342cb6dfc091ceff8c41f87998e99380e..a925c728782a2a3feda471d870d9123e84b9e58c 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.228 2003/01/17 05:37:24 robertc Exp $
+ * $Id: tools.cc,v 1.229 2003/01/17 08:21:51 robertc Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -60,7 +60,7 @@ SQUIDCEXTERN void backtrace_symbols_fd(void *, int, int);
 SQUIDCEXTERN int setresuid(uid_t, uid_t, uid_t);
 #endif /* _SQUID_LINUX */
 
-extern void (*failure_notify) (const char *);
+SQUIDCEXTERN void (*failure_notify) (const char *);
 
 MemPool *dlink_node_pool = NULL;