Commit 95aa4fb0 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

fix the tokudb build. closes #1491

git-svn-id: file:///svn/toku/tokudb@9554 c7de825b-a66e-492c-adef-691d508d4ae1
parent 127637aa
...@@ -10,8 +10,7 @@ toku_set_func_pwrite (ssize_t (*pwrite_fun)(int, const void *, size_t, off_t)) { ...@@ -10,8 +10,7 @@ toku_set_func_pwrite (ssize_t (*pwrite_fun)(int, const void *, size_t, off_t)) {
} }
ssize_t ssize_t
toku_os_pwrite (int fd, const void *buf, size_t len, off_t off) toku_os_pwrite (int fd, const void *buf, size_t len, off_t off) {
{
if (t_pwrite) { if (t_pwrite) {
return t_pwrite(fd, buf, len, off); return t_pwrite(fd, buf, len, off);
} else { } else {
...@@ -19,8 +18,6 @@ toku_os_pwrite (int fd, const void *buf, size_t len, off_t off) ...@@ -19,8 +18,6 @@ toku_os_pwrite (int fd, const void *buf, size_t len, off_t off)
} }
} }
#if 0
static ssize_t (*t_write)(int, const void *, size_t) = 0; static ssize_t (*t_write)(int, const void *, size_t) = 0;
int int
...@@ -29,7 +26,14 @@ toku_set_func_write (ssize_t (*write_fun)(int, const void *, size_t)) { ...@@ -29,7 +26,14 @@ toku_set_func_write (ssize_t (*write_fun)(int, const void *, size_t)) {
return 0; return 0;
} }
#endif ssize_t
toku_os_write (int fd, const void *buf, size_t len) {
if (t_pwrite) {
return t_write(fd, buf, len);
} else {
return write(fd, buf, len);
}
}
...@@ -101,6 +101,7 @@ void *os_malloc(size_t); ...@@ -101,6 +101,7 @@ void *os_malloc(size_t);
void *os_realloc(void*,size_t); void *os_realloc(void*,size_t);
void os_free(void*); void os_free(void*);
ssize_t toku_os_pwrite (int fd, const void *buf, size_t len, off_t off); ssize_t toku_os_pwrite (int fd, const void *buf, size_t len, off_t off);
ssize_t toku_os_write (int fd, const void *buf, size_t len);
int toku_set_func_fsync (int (*fsync_function)(int)); int toku_set_func_fsync (int (*fsync_function)(int));
int toku_set_func_malloc (void *(*)(size_t)); int toku_set_func_malloc (void *(*)(size_t));
......
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