summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2013-07-17 17:46:10 +0000
committerChristopher Faylor <me@cgf.cx>2013-07-17 17:46:10 +0000
commite6f4f3f7eedd355d78f1751e724731a7842bc7db (patch)
tree62222393eb46a0c771d9ccdd03eacd17d540db35
parentd1b5846f2985560358170e7ec05570ce34c348bc (diff)
downloadcygnal-e6f4f3f7eedd355d78f1751e724731a7842bc7db.tar.gz
cygnal-e6f4f3f7eedd355d78f1751e724731a7842bc7db.tar.bz2
cygnal-e6f4f3f7eedd355d78f1751e724731a7842bc7db.zip
* winsup.h (cygbench): Fix declaration to match definition.
* dcrt0.cc (initial_env): Remove unused variable.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/dcrt0.cc5
2 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f9dd5c76d..41d94b90f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-17 Christopher Faylor <me.cygwin2013@cgf.cx>
+
+ * winsup.h (cygbench): Fix declaration to match definition.
+ * dcrt0.cc (initial_env): Remove unused variable.
+
2013-07-15 Corinna Vinschen <corinna@vinschen.de>
Remove /dev/mem, /dev/kmem, /dev/port support.
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 255ca5c32..d348d9bd5 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -509,12 +509,11 @@ initial_env ()
_cygwin_testing = 1;
#ifdef DEBUGGING
- DWORD len;
char buf[NT_MAX_PATH];
if (GetEnvironmentVariableA ("CYGWIN_DEBUG", buf, sizeof (buf) - 1))
{
char buf1[NT_MAX_PATH];
- len = GetModuleFileName (NULL, buf1, NT_MAX_PATH);
+ GetModuleFileName (NULL, buf1, NT_MAX_PATH);
strlwr (buf1);
strlwr (buf);
char *p = strpbrk (buf, ":=");
@@ -1304,7 +1303,7 @@ are unable to find another cygwin DLL.",
}
#ifdef DEBUGGING
-void __stdcall
+void __reg1
cygbench (const char *s)
{
if (GetEnvironmentVariableA ("CYGWIN_BENCH", NULL, 0))