diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-05-17 05:26:16 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-05-17 05:26:16 +0400 |
| commit | ac674bc8966184389f1f745790d2372922fe2a00 (patch) | |
| tree | 0617a82bf5a766da5f46b8be2c7fb5257dc14e5c /winsup/utils | |
| parent | 5c8e6fbd8cba2653984ca48d8a1872b3e6974a2c (diff) | |
* cygcheck.cc (cygwin_internal): Define as a "C" function.
* strace.cc (cygwin_internal): Ditto.
* cygpath.cc (print_version): Update copyright.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 4 | ||||
| -rw-r--r-- | winsup/utils/cygpath.cc | 4 | ||||
| -rw-r--r-- | winsup/utils/strace.cc | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index fbe06db77..826f959fc 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 fc334cee8..07d5823de 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 641085925..62657594c 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 702635eb2..a8e195da8 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 () |