From: hno <>
Date: Fri, 18 Mar 2005 22:47:41 +0000 (+0000)
Subject: Rename windows debug trap variable do_debug to do_debug_trap to make
X-Git-Tag: SQUID_3_0_PRE4~839
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fa994acc815ecaf45f540591d0aa48e97877f1b;p=thirdparty%2Fsquid.git

Rename windows debug trap variable do_debug to do_debug_trap to make
room for other uses of do_debug
---

diff --git a/src/globals.h b/src/globals.h
index 5ce7cc5149..006e131f4c 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.128 2005/02/05 22:49:43 hno Exp $
+ * $Id: globals.h,v 1.129 2005/03/18 15:47:41 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -165,7 +165,7 @@ extern char *WIN32_Command_Line;        /* NULL */
 extern char *WIN32_Service_Command_Line; /* NULL */
 extern unsigned int WIN32_run_mode;     /* _WIN_SQUID_RUN_MODE_INTERACTIVE */
 #if defined(_SQUID_MSWIN_) && defined(_DEBUG)
-extern int do_debug;	                /* 0 */
+extern int do_debug_trap;	                /* 0 */
 #endif
 #endif
 #if HAVE_SBRK
diff --git a/src/main.cc b/src/main.cc
index f230aa9e3b..d8b009161d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.404 2005/03/13 09:23:33 serassio Exp $
+ * $Id: main.cc,v 1.405 2005/03/18 15:47:42 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -1101,8 +1101,8 @@ main(int argc, char **argv)
             do_reconfigure = 0;
 #if defined(_SQUID_MSWIN_) && defined(_DEBUG)
 
-        } else if (do_debug) {
-            do_debug = 0;
+        } else if (do_debug_trap) {
+            do_debug_trap = 0;
             __asm int 3;
 #endif
 
diff --git a/src/tools.cc b/src/tools.cc
index c336b74cbc..3c550c3c4a 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.252 2005/03/13 09:23:33 serassio Exp $
+ * $Id: tools.cc,v 1.253 2005/03/18 15:47:42 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -380,7 +380,7 @@ void
 sigusr2_handle(int sig)
 {
 #if defined(_SQUID_MSWIN_) && defined(_DEBUG)
-    do_debug = 1;
+    do_debug_trap = 1;
 #endif
 #if (defined(_SQUID_MSWIN_) && !defined(_DEBUG)) || !defined(_SQUID_MSWIN_)