mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5811 fix mac build

Browse source 
git-svn-id: file:///svn/toku/tokudb@51254 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2013-04-17 00:01:24 -04:00 • committed by Yoni Fogel
parent ce3d75552b
commit 3cb519b5e6
6 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
portability/file.cc
View file

@ -430,8 +430,3 @@ int toku_fsync_directory(const char *fname) {
toku_free(dirname);
return result;
}
FILE *toku_os_fmemopen(void *buf, size_t size, const char *mode) {
return fmemopen(buf, size, mode);
}

4
portability/toku_random.h
View file

@ -13,8 +13,6 @@
#include <stdint.h>
#include <limits.h>
namespace toku {
#if defined(HAVE_RANDOM_R)
// Definition of randu62 and randu64 assume myrandom_r generates 31 low-order bits
static_assert(RAND_MAX == INT32_MAX, "Unexpected RAND_MAX");
@ -87,6 +85,4 @@ rand_choices(struct random_data *buf, uint32_t choices) {
return result;
}
} // end namespace toku
#endif // TOKU_RANDOM_H

1
src/tests/maxsize-for-loader.cc
View file

@ -9,7 +9,6 @@
#include <sys/stat.h>
#include "toku_random.h"
using namespace toku;
bool fast = false;
DB_ENV *env;

3
src/tests/test.h
View file

@ -216,10 +216,9 @@ uint_dbt_cmp (DB *db, const DBT *a, const DBT *b) {
#include <memory.h>
unsigned int seed = 0xFEEDFACE;
static uint64_t __attribute__((__unused__))
random64(void) {
const unsigned int seed = 0xFEEDFACE;
static int seeded = 0;
if (!seeded) {
seeded = 1;

5
src/tests/test_error.cc
View file

@ -21,10 +21,6 @@ int
test_main (int argc, char *const argv[]) {
parse_args(argc, argv);
#if defined(OSX)
if (verbose) printf("Warning: fmemopen does not exist in OSX!\n");
#else
int r;
r = system("rm -rf " ENVDIR);
CKERR(r);
@ -97,6 +93,5 @@ test_main (int argc, char *const argv[]) {
}
}
}
#endif
return 0;
}

1
toku_include/toku_portability.h
View file

@ -266,7 +266,6 @@ int toku_os_close(int fd);
int toku_os_fclose(FILE * stream);
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);
FILE *toku_os_fmemopen(void *buf, size_t size, const char *mode);
// wrapper around fsync
void toku_file_fsync_without_accounting(int fd);