From cc95baad414526fd2764e92f445a1b3f1d3db2ab Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 11 May 2003 21:52:09 +0000 Subject: [PATCH] Replace ino_t by __ino64_t throughout. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/dir.cc | 2 +- winsup/cygwin/fhandler.h | 4 ++-- winsup/cygwin/fhandler_disk_file.cc | 3 ++- winsup/cygwin/fhandler_socket.cc | 2 +- winsup/cygwin/path.cc | 4 ++-- winsup/cygwin/winsup.h | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a4fab1308..750d81040 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2003-05-11 Corinna Vinschen + + Replace ino_t by __ino64_t throughout. + 2003-05-11 Corinna Vinschen * include/cygwin/types.h: Add key_t typedef. diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 9bd18c17e..9c50bda1b 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -142,7 +142,7 @@ readdir (DIR *dir) else { hashit: - ino_t dino = hash_path_name (dir->__d_dirhash, "\\"); + __ino64_t dino = hash_path_name (dir->__d_dirhash, "\\"); dir->__d_dirent->d_ino = hash_path_name (dino, res->d_name); } } diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 23e597cd8..781f0838e 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -151,7 +151,7 @@ class fhandler_base int access; HANDLE io_handle; - ino_t namehash; /* hashed filename, used as inode num */ + __ino64_t namehash; /* hashed filename, used as inode num */ protected: /* Full unix path name of this file */ @@ -292,7 +292,7 @@ class fhandler_base const char *get_name () { return unix_path_name; } const char *get_win32_name () { return win32_path_name; } - ino_t get_namehash () { return namehash; } + __ino64_t get_namehash () { return namehash; } virtual void hclose (HANDLE h) {CloseHandle (h);} virtual void set_inheritance (HANDLE &h, int not_inheriting); diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 3a944200b..bd235b35d 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -250,7 +250,8 @@ fhandler_disk_file::fstat_helper (struct __stat64 *buf, path_conv *pc, case DRIVE_RAMDISK: /* Although the documentation indicates otherwise, it seems like "inodes" on these devices are persistent, at least across reboots. */ - buf->st_ino = (((ino_t) nFileIndexHigh) << 32) | (ino_t) nFileIndexLow; + buf->st_ino = (((__ino64_t) nFileIndexHigh) << 32) + | (__ino64_t) nFileIndexLow; break; default: /* Either the nFileIndex* fields are unreliable or unavailable. Use the diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 05bbcda3c..c53c3b56c 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -442,7 +442,7 @@ fhandler_socket::fstat (struct __stat64 *buf, path_conv *pc) if (get_socket_type ()) /* fstat */ { buf->st_dev = 0; - buf->st_ino = (ino_t) ((DWORD) get_handle ()); + buf->st_ino = (__ino64_t) ((DWORD) get_handle ()); buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO; } else diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 5d1cdcb7d..d381c4c61 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -3185,8 +3185,8 @@ readlink (const char *path, char *buf, int buflen) the directory. FIXME: Not bullet-proof. */ /* Cygwin internal */ -ino_t __stdcall -hash_path_name (ino_t hash, const char *name) +__ino64_t __stdcall +hash_path_name (__ino64_t hash, const char *name) { if (!*name) return hash; diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 70a9c1225..0fe2cfca9 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -199,7 +199,7 @@ int __stdcall writable_directory (const char *file); int __stdcall stat_dev (DWORD, int, unsigned long, struct __stat64 *); extern BOOL allow_ntsec; -ino_t __stdcall hash_path_name (ino_t hash, const char *name) __attribute__ ((regparm(2))); +__ino64_t __stdcall hash_path_name (__ino64_t hash, const char *name) __attribute__ ((regparm(2))); void __stdcall nofinalslash (const char *src, char *dst) __attribute__ ((regparm(2))); extern "C" char *__stdcall rootdir (char *full_path) __attribute__ ((regparm(1)));