* dir.cc: Change __off32_t to _off_t and __off64_t to _off64_t
throughout. * fhandler.cc: Ditto. * fhandler.h: Ditto. * fhandler_clipboard.cc: Ditto. * fhandler_disk_file.cc: Ditto. * fhandler_dsp.cc: Ditto. * fhandler_floppy.cc: Ditto. * fhandler_mem.cc: Ditto. * fhandler_proc.cc: Ditto. * fhandler_process.cc: Ditto. * fhandler_random.cc: Ditto. * fhandler_registry.cc: Ditto. * fhandler_tape.cc: Ditto. * fhandler_termios.cc: Ditto. * fhandler_virtual.cc: Ditto. * fhandler_zero.cc: Ditto. * mmap.cc: Ditto. * pipe.cc: Ditto. * syscalls.cc: Ditto. * winsup.h: Ditto. * include/cygwin/stat.h: Ditto. * include/cygwin/types.h: Ditto. Remove definition of __off32_t and __off64_t.
This commit is contained in:
@ -79,11 +79,11 @@ static const DWORD proc_fhandlers[PROC_LINK_COUNT] = {
|
||||
const char proc[] = "/proc";
|
||||
const int proc_len = sizeof (proc) - 1;
|
||||
|
||||
static __off64_t format_proc_meminfo (char *destbuf, size_t maxsize);
|
||||
static __off64_t format_proc_stat (char *destbuf, size_t maxsize);
|
||||
static __off64_t format_proc_uptime (char *destbuf, size_t maxsize);
|
||||
static __off64_t format_proc_cpuinfo (char *destbuf, size_t maxsize);
|
||||
static __off64_t format_proc_partitions (char *destbuf, size_t maxsize);
|
||||
static _off64_t format_proc_meminfo (char *destbuf, size_t maxsize);
|
||||
static _off64_t format_proc_stat (char *destbuf, size_t maxsize);
|
||||
static _off64_t format_proc_uptime (char *destbuf, size_t maxsize);
|
||||
static _off64_t format_proc_cpuinfo (char *destbuf, size_t maxsize);
|
||||
static _off64_t format_proc_partitions (char *destbuf, size_t maxsize);
|
||||
|
||||
/* Auxillary function that returns the fhandler associated with the given path
|
||||
this is where it would be nice to have pattern matching in C - polymorphism
|
||||
@ -387,7 +387,7 @@ fhandler_proc::fill_filebuf ()
|
||||
return true;
|
||||
}
|
||||
|
||||
static __off64_t
|
||||
static _off64_t
|
||||
format_proc_meminfo (char *destbuf, size_t maxsize)
|
||||
{
|
||||
unsigned long mem_total = 0UL, mem_free = 0UL, swap_total = 0UL,
|
||||
@ -417,7 +417,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize)
|
||||
swap_total >> 10, swap_free >> 10);
|
||||
}
|
||||
|
||||
static __off64_t
|
||||
static _off64_t
|
||||
format_proc_uptime (char *destbuf, size_t maxsize)
|
||||
{
|
||||
unsigned long long uptime = 0ULL, idle_time = 0ULL;
|
||||
@ -453,7 +453,7 @@ out:
|
||||
idle_time / 100, long (idle_time % 100));
|
||||
}
|
||||
|
||||
static __off64_t
|
||||
static _off64_t
|
||||
format_proc_stat (char *destbuf, size_t maxsize)
|
||||
{
|
||||
unsigned long long user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;
|
||||
@ -581,7 +581,7 @@ can_set_flag (unsigned flag)
|
||||
return ((r1 ^ r2) & flag) != 0;
|
||||
}
|
||||
|
||||
static __off64_t
|
||||
static _off64_t
|
||||
format_proc_cpuinfo (char *destbuf, size_t maxsize)
|
||||
{
|
||||
SYSTEM_INFO siSystemInfo;
|
||||
@ -858,7 +858,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
|
||||
|
||||
#undef read_value
|
||||
|
||||
static __off64_t
|
||||
static _off64_t
|
||||
format_proc_partitions (char *destbuf, size_t maxsize)
|
||||
{
|
||||
char *bufptr = destbuf;
|
||||
|
Reference in New Issue
Block a user