From: Mark Andrews <marka@isc.org>
Date: Sun, 16 Nov 2008 22:49:18 +0000 (+0000)
Subject: fix for windows compiler
X-Git-Tag: v9.6.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a435080fb8fd31cebc976f1b0af52fcc869dc8aa;p=thirdparty%2Fbind9.git

fix for windows compiler
---

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 7060d25c197..6040dc30eb0 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.79 2008/11/06 23:47:06 tbox Exp $ */
+/* $Id: globals.h,v 1.80 2008/11/16 22:49:18 marka Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
@@ -112,18 +112,20 @@ EXTERN const char *		ns_g_chrootdir		INIT(NULL);
 EXTERN isc_boolean_t		ns_g_foreground		INIT(ISC_FALSE);
 EXTERN isc_boolean_t		ns_g_logstderr		INIT(ISC_FALSE);
 
-EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
-							     "/run/"
 #if NS_RUN_PID_DIR
-							     "named/"
-#endif
+EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
+							     "/run/named/"
 							     "named.pid");
 EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
-							     "/run/"
-#if NS_RUN_PID_DIR
-							     "lwresd/"
-#endif
+							     "/run/lwresd/"
 							     "lwresd.pid");
+#else
+EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
+							     "/run/named.pid");
+EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
+							     "/run/lwresd.pid");
+#endif
+
 EXTERN const char *		ns_g_username		INIT(NULL);
 
 EXTERN int			ns_g_listen		INIT(3);