diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-06-18 17:43:45 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-06-18 17:43:45 +0000 |
| commit | 6d4186757b2e32f4c0546842e7dd454236641f47 (patch) | |
| tree | 4ca1947f476bc029b4bf1d42c904276e6106745b | |
| parent | ce4a7304b88a639907c39e0187f355759bf08db6 (diff) | |
| download | cygnal-6d4186757b2e32f4c0546842e7dd454236641f47.tar.gz cygnal-6d4186757b2e32f4c0546842e7dd454236641f47.tar.bz2 cygnal-6d4186757b2e32f4c0546842e7dd454236641f47.zip | |
* fhandler.h (set_name): Don't use 'unix' as name since this is defined by gcc
now.
* fhandler.cc (set_name): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 10 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2e8c3b46f..b6d09af27 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 18 13:42:50 2000 Christopher Faylor <cgf@cygnus.com> + + * fhandler.h (set_name): Don't use 'unix' as name since this is defined + by gcc now. + * fhandler.cc (set_name): Ditto. + 2000-06-17 Kazuhiro Fujieda <fujieda@jaist.ac.jp> * winsup.h (isabspath): Don't report `C:foo' as an absolute path. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 17f2db194..b2a8054a0 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -124,7 +124,7 @@ fhandler_base::get_readahead_into_buffer (char *buf, size_t buflen) */ void -fhandler_base::set_name (const char *unix, const char *win32, int unit) +fhandler_base::set_name (const char *unix_path, const char *win32_path, int unit) { if (!no_free_names ()) { @@ -135,18 +135,18 @@ fhandler_base::set_name (const char *unix, const char *win32, int unit) } unix_path_name_ = win32_path_name_ = NULL; - if (unix == NULL || !*unix) + if (unix_path == NULL || !*unix_path) return; - unix_path_name_ = strdup (unix); + unix_path_name_ = strdup (unix_path); if (unix_path_name_ == NULL) { system_printf ("fatal error. strdup failed"); exit (ENOMEM); } - if (win32) - win32_path_name_ = strdup (win32); + if (win32_path) + win32_path_name_ = strdup (win32_path); else { const char *fmt = get_native_name (); diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index a3002ab1b..802fd2ac2 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -143,7 +143,8 @@ protected: char *win32_path_name_; public: - void set_name (const char *unix, const char *win32 = NULL, int unit = 0); + void set_name (const char * unix_path, const char * win32_path = NULL, + int unit = 0); virtual fhandler_base& operator =(fhandler_base &x) { |