Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e24dd977
Commit
e24dd977
authored
Dec 15, 2012
by
John Esmet
Committed by
Yoni Fogel
Apr 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refs #5811 fix mac build
git-svn-id:
file:///svn/toku/tokudb@51254
c7de825b-a66e-492c-adef-691d508d4ae1
parent
682dece1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
18 deletions
+1
-18
portability/file.cc
portability/file.cc
+0
-5
portability/toku_random.h
portability/toku_random.h
+0
-4
src/tests/maxsize-for-loader.cc
src/tests/maxsize-for-loader.cc
+0
-1
src/tests/test.h
src/tests/test.h
+1
-2
src/tests/test_error.cc
src/tests/test_error.cc
+0
-5
toku_include/toku_portability.h
toku_include/toku_portability.h
+0
-1
No files found.
portability/file.cc
View file @
e24dd977
...
@@ -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
);
}
portability/toku_random.h
View file @
e24dd977
...
@@ -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
src/tests/maxsize-for-loader.cc
View file @
e24dd977
...
@@ -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
;
...
...
src/tests/test.h
View file @
e24dd977
...
@@ -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
;
...
...
src/tests/test_error.cc
View file @
e24dd977
...
@@ -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
;
}
}
toku_include/toku_portability.h
View file @
e24dd977
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment