From a12518a37c7e0e21b55f75b0fc5cf9579e728e65 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 6 Oct 2009 03:39:38 +0000
Subject: [PATCH] * exceptions.cc: Move global variable sigExeced... *
 globals.cc: here. * pinfo.cc (pinfo::maybe_set_exit_code_from_windows):
 Remove now unneeded declaration.

---
 winsup/cygwin/ChangeLog     | 7 +++++++
 winsup/cygwin/exceptions.cc | 1 -
 winsup/cygwin/globals.cc    | 1 +
 winsup/cygwin/pinfo.cc      | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d1d12b935..2bbff36c6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-05  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+	* exceptions.cc: Move global variable sigExeced...
+	* globals.cc: here.
+	* pinfo.cc (pinfo::maybe_set_exit_code_from_windows): Remove now
+	unneeded declaration.
+
 2009-10-04  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* Makefile.in (CFLAGS): Add -mno-use-libstdc-wrappers.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 9d8de7570..05d30f2ef 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -40,7 +40,6 @@ extern void sigdelayed ();
 };
 
 extern child_info_spawn *chExeced;
-int NO_COPY sigExeced;
 
 static BOOL WINAPI ctrl_c_handler (DWORD);
 static WCHAR windows_system_directory[1024];
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 7a408bb84..a1a4ae946 100644
--- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc
@@ -23,6 +23,7 @@ HANDLE NO_COPY hProcToken;
 HANDLE NO_COPY hProcImpToken;
 HMODULE NO_COPY cygwin_hmodule;
 HANDLE hExeced;
+int NO_COPY sigExeced;
 
 /* program exit the program */
 
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 5ac29fc30..ee11d20e0 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -140,7 +140,6 @@ pinfo::maybe_set_exit_code_from_windows ()
 {
   DWORD x = 0xdeadbeef;
   DWORD oexitcode = self->exitcode;
-  extern int sigExeced;
 
   if (hProcess && !(self->exitcode & EXITCODE_SET))
     {