Commit 5dc8b6ac authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

compile with gcc. addresses #1185

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6469 c7de825b-a66e-492c-adef-691d508d4ae1
parent 0aa68677
...@@ -30,6 +30,8 @@ static inline unsigned long long rdtsc() { ...@@ -30,6 +30,8 @@ static inline unsigned long long rdtsc() {
return r; return r;
} }
#else
#define USE_RDTSC 0 #define USE_RDTSC 0
#endif #endif
...@@ -605,7 +605,7 @@ int toku_fread_DISKOFF (FILE *f, DISKOFF *diskoff, struct x1764 *checksum, u_int ...@@ -605,7 +605,7 @@ int toku_fread_DISKOFF (FILE *f, DISKOFF *diskoff, struct x1764 *checksum, u_int
return r; return r;
} }
int toku_fread_BLOCKNUM (FILE *f, BLOCKNUM *blocknum, struct x1764 *checksum, u_int32_t *len) { int toku_fread_BLOCKNUM (FILE *f, BLOCKNUM *blocknum, struct x1764 *checksum, u_int32_t *len) {
u_int64_t b; u_int64_t b = 0;
int r = toku_fread_u_int64_t (f, &b, checksum, len); // sign conversion will be OK. int r = toku_fread_u_int64_t (f, &b, checksum, len); // sign conversion will be OK.
blocknum->b=b; blocknum->b=b;
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment