Commit e24dd977 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

refs #5811 fix mac build


git-svn-id: file:///svn/toku/tokudb@51254 c7de825b-a66e-492c-adef-691d508d4ae1
parent 682dece1
...@@ -430,8 +430,3 @@ int toku_fsync_directory(const char *fname) { ...@@ -430,8 +430,3 @@ int toku_fsync_directory(const char *fname) {
toku_free(dirname); toku_free(dirname);
return result; return result;
} }
FILE *toku_os_fmemopen(void *buf, size_t size, const char *mode) {
return fmemopen(buf, size, mode);
}
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include <stdint.h> #include <stdint.h>
#include <limits.h> #include <limits.h>
namespace toku {
#if defined(HAVE_RANDOM_R) #if defined(HAVE_RANDOM_R)
// Definition of randu62 and randu64 assume myrandom_r generates 31 low-order bits // Definition of randu62 and randu64 assume myrandom_r generates 31 low-order bits
static_assert(RAND_MAX == INT32_MAX, "Unexpected RAND_MAX"); static_assert(RAND_MAX == INT32_MAX, "Unexpected RAND_MAX");
...@@ -87,6 +85,4 @@ rand_choices(struct random_data *buf, uint32_t choices) { ...@@ -87,6 +85,4 @@ rand_choices(struct random_data *buf, uint32_t choices) {
return result; return result;
} }
} // end namespace toku
#endif // TOKU_RANDOM_H #endif // TOKU_RANDOM_H
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "toku_random.h" #include "toku_random.h"
using namespace toku;
bool fast = false; bool fast = false;
DB_ENV *env; DB_ENV *env;
......
...@@ -216,10 +216,9 @@ uint_dbt_cmp (DB *db, const DBT *a, const DBT *b) { ...@@ -216,10 +216,9 @@ uint_dbt_cmp (DB *db, const DBT *a, const DBT *b) {
#include <memory.h> #include <memory.h>
unsigned int seed = 0xFEEDFACE;
static uint64_t __attribute__((__unused__)) static uint64_t __attribute__((__unused__))
random64(void) { random64(void) {
const unsigned int seed = 0xFEEDFACE;
static int seeded = 0; static int seeded = 0;
if (!seeded) { if (!seeded) {
seeded = 1; seeded = 1;
......
...@@ -21,10 +21,6 @@ int ...@@ -21,10 +21,6 @@ int
test_main (int argc, char *const argv[]) { test_main (int argc, char *const argv[]) {
parse_args(argc, argv); parse_args(argc, argv);
#if defined(OSX)
if (verbose) printf("Warning: fmemopen does not exist in OSX!\n");
#else
int r; int r;
r = system("rm -rf " ENVDIR); r = system("rm -rf " ENVDIR);
CKERR(r); CKERR(r);
...@@ -97,6 +93,5 @@ test_main (int argc, char *const argv[]) { ...@@ -97,6 +93,5 @@ test_main (int argc, char *const argv[]) {
} }
} }
} }
#endif
return 0; return 0;
} }
...@@ -266,7 +266,6 @@ int toku_os_close(int fd); ...@@ -266,7 +266,6 @@ int toku_os_close(int fd);
int toku_os_fclose(FILE * stream); int toku_os_fclose(FILE * stream);
ssize_t toku_os_read(int fd, void *buf, size_t count); ssize_t toku_os_read(int fd, void *buf, size_t count);
ssize_t toku_os_pread(int fd, void *buf, size_t count, off_t offset); ssize_t toku_os_pread(int fd, void *buf, size_t count, off_t offset);
FILE *toku_os_fmemopen(void *buf, size_t size, const char *mode);
// wrapper around fsync // wrapper around fsync
void toku_file_fsync_without_accounting(int fd); void toku_file_fsync_without_accounting(int fd);
......
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