aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-05-17 01:26:16 +0000
committerChristopher Faylor <me@cgf.cx>2005-05-17 01:26:16 +0000
commitac674bc8966184389f1f745790d2372922fe2a00 (patch)
tree0617a82bf5a766da5f46b8be2c7fb5257dc14e5c
parent5c8e6fbd8cba2653984ca48d8a1872b3e6974a2c (diff)
downloadnewlib-ac674bc8966184389f1f745790d2372922fe2a00.zip
newlib-ac674bc8966184389f1f745790d2372922fe2a00.tar.gz
newlib-ac674bc8966184389f1f745790d2372922fe2a00.tar.bz2
* cygcheck.cc (cygwin_internal): Define as a "C" function.
* strace.cc (cygwin_internal): Ditto. * cygpath.cc (print_version): Update copyright.
-rw-r--r--winsup/utils/ChangeLog7
-rw-r--r--winsup/utils/cygcheck.cc4
-rw-r--r--winsup/utils/cygpath.cc4
-rw-r--r--winsup/utils/strace.cc4
4 files changed, 15 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index fbe06db..826f959 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-16 Christopher Faylor <cgf@timesys.com>
+
+ * cygcheck.cc (cygwin_internal): Define as a "C" function.
+ * strace.cc (cygwin_internal): Ditto.
+
+ * cygpath.cc (print_version): Update copyright.
+
2005-05-15 Christopher Faylor <cgf@timesys.com>
* cygcheck.cc (load_cygwin): Avoid calling putenv with a NULL path.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index fc334ce..07d5823 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1439,7 +1439,9 @@ nuke (char *ev)
putenv (s);
}
-DWORD (*cygwin_internal) (int, ...);
+extern "C" {
+unsigned long (*cygwin_internal) (int, ...);
+};
static void
load_cygwin (int& argc, char **&argv)
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 6410859..6265759 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -1,5 +1,5 @@
/* cygpath.cc -- convert pathnames between Windows and Unix format
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
This file is part of Cygwin.
@@ -535,7 +535,7 @@ print_version ()
printf ("\
cygpath (cygwin) %.*s\n\
Path Conversion Utility\n\
-Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
+Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.\n\
Compiled on %s\n\
", len, v, __DATE__);
}
diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
index 702635e..a8e195d 100644
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/strace.cc
@@ -250,7 +250,9 @@ ctrl_c (DWORD)
return TRUE;
}
-DWORD (*cygwin_internal) (int, ...);
+extern "C" {
+unsigned long (*cygwin_internal) (int, ...);
+};
static int
load_cygwin ()