From 8b6ff6ca6b73051104ffd8bf1a8ee74b0be7ce74 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 24 Mar 2004 09:24:16 +0000 Subject: [PATCH] static-cm_dnsEnabled-20040323 Make cm_dns.c cm_dnsEnabled static to prevent potential conflict (not really) with a variable of the same name in afsd_init.c --- src/WINNT/afsd/afsd_init.c | 2 +- src/WINNT/afsd/cm_dns.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index c6cfb30..5094885 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -89,7 +89,7 @@ cm_initparams_v1 cm_initParams; HANDLE afsi_file; #ifdef AFS_AFSDB_ENV -extern int cm_dnsEnabled; +int cm_dnsEnabled = 1; #endif char cm_NetBiosName[32]; diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index 0d53e51..e817fc2 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -26,11 +26,7 @@ static char dns_addr[30]; #ifdef DJGPP extern char cm_confDir[]; #endif -#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x500 -int cm_dnsEnabled = -1; -#else -int cm_dnsEnabled = 1; /* assume on */ -#endif +static int cm_dnsEnabled = -1; void DNSlowerCase(char *str) { -- 1.9.4