vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

ChangeLog, gen_uuid.c: 

Use clock_reg instead of clock, since clock conflicts with a header
  file declaration.
bitmap-optimize
Theodore Ts'o 1997-10-15 01:52:44 +00:00
parent 1b6bf1759a
commit d546447fda
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/uuid/ChangeLog
View File

@ -1,3 +1,8 @@
Tue Oct 14 21:48:16 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
* gen_uuid.c: Use clock_reg instead of clock, since clock
conflicts with a header file declaration.
Tue Jun 17 01:33:20 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
* Release of E2fsprogs 1.11

12
lib/uuid/gen_uuid.c
View File

@ -151,7 +151,7 @@ static int get_clock(__u32 *clock_high, __u32 *clock_low, __u16 *ret_clock_seq)
static struct timeval last = {0, 0};
static __u16 clock_seq;
struct timeval tv;
unsigned long long clock;
unsigned long long clock_reg;
try_again:
gettimeofday(&tv, 0);
@ -174,12 +174,12 @@ try_again:
} else
adjustment = 0;
clock = tv.tv_usec*10 + adjustment;
clock += ((unsigned long long) tv.tv_sec)*10000000;
clock += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
clock_reg = tv.tv_usec*10 + adjustment;
clock_reg += ((unsigned long long) tv.tv_sec)*10000000;
clock_reg += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
*clock_high = clock >> 32;
*clock_low = clock;
*clock_high = clock_reg >> 32;
*clock_low = clock_reg;
*ret_clock_seq = clock_seq;
return 0;
}