stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed BSD check macros

Browse source
This commit is contained in:
Snaipe 2015-09-19 14:43:28 +02:00
parent 98366789f6
commit 43865a5045
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compat/mockfile.c
View file

@ -30,9 +30,9 @@
#include "internal.h"
#include "criterion/redirect.h"
#if defined(BSD) || defined(__unix__)
#if defined(OS_BSD) || defined(__unix__)
# ifdef BSD
# ifdef OS_BSD
typedef int cr_count;
typedef int cr_retcount;
typedef fpos_t cr_off;
@ -71,7 +71,7 @@ static inline size_t off_safe_add(size_t size, size_t cur, cr_off off) {
static cr_retcount mock_file_read(void *cookie, char *buf, cr_count count) {
struct memfile *mf = cookie;
# ifdef BSD
# ifdef OS_BSD
if (count < 0)
errno_return(EINVAL, (cr_retcount) -1);
# endif
@ -87,7 +87,7 @@ static cr_retcount mock_file_read(void *cookie, char *buf, cr_count count) {
static cr_retcount mock_file_write(void *cookie, const char *buf, cr_count count) {
struct memfile *mf = cookie;
# ifdef BSD
# ifdef OS_BSD
if (count < 0)
errno_return(EINVAL, (cr_retcount) -1);
# endif
@ -115,7 +115,7 @@ static cr_retcount mock_file_write(void *cookie, const char *buf, cr_count count
return count;
}
# ifdef BSD
# ifdef OS_BSD
static cr_off mock_file_seek(void *cookie, cr_off off, int whence) {
struct memfile *mf = cookie;
switch (whence) {
@ -149,7 +149,7 @@ static int mock_file_close(void *cookie) {
#endif
FILE *cr_mock_file_size(size_t max_size) {
#if defined(__unix__) || defined(BSD)
#if defined(__unix__) || defined(OS_BSD)
struct memfile *cookie = malloc(sizeof (struct memfile));
*cookie = (struct memfile) {
.max_size = max_size,

8
src/compat/posix.h
View file

@ -28,6 +28,14 @@
# define VANILLA_WIN32
#endif
# if defined(BSD) \
|| defined(__FreeBSD__) \
|| defined(__NetBSD__) \
|| defined(__OpenBSD__) \
|| defined(__DragonFly__)
# define OS_BSD 1
# endif
# if !defined(_POSIX_SOURCE)
# define _POSIX_SOURCE 1
# define TMP_POSIX