* fhandler.h (set_name): Don't use 'unix' as name since this is defined by gcc

now.
* fhandler.cc (set_name): Ditto.
This commit is contained in:
Christopher Faylor 2000-06-18 17:43:45 +00:00
parent ce4a7304b8
commit 6d4186757b
3 changed files with 13 additions and 6 deletions

View File

@ -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.

View File

@ -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 ();

View File

@ -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)
{