capture: allow macros and functions to co-exist

This commit is contained in:
Christian Hergert
2019-05-07 23:05:44 -07:00
parent 394772cb01
commit 173b583556
2 changed files with 23 additions and 23 deletions

View File

@ -29,12 +29,12 @@
#include <unistd.h> #include <unistd.h>
#ifdef __linux__ #ifdef __linux__
# define _sp_getpagesize getpagesize # define _sp_getpagesize() getpagesize()
# define _sp_pread pread # define _sp_pread(a,b,c,d) pread(a,b,c,d)
# define _sp_pwrite pwrite # define _sp_pwrite(a,b,c,d) pwrite(a,b,c,d)
# define _sp_write write # define _sp_write(a,b,c) write(a,b,c)
# define _sp_getpid getpid # define _sp_getpid() getpid()
# define _sp_sendfile sendfile # define _sp_sendfile(a,b,c,d) sendfile(a,b,c,d)
#else #else
size_t _sp_getpagesize (void); size_t _sp_getpagesize (void);
ssize_t _sp_pread (int fd, ssize_t _sp_pread (int fd,

View File

@ -34,7 +34,7 @@ static G_LOCK_DEFINE (_sp_io_sync);
#endif #endif
size_t size_t
_sp_getpagesize (void) (_sp_getpagesize) (void)
{ {
static size_t pgsz = 0; static size_t pgsz = 0;
@ -53,10 +53,10 @@ _sp_getpagesize (void)
} }
ssize_t ssize_t
_sp_pread (int fd, (_sp_pread) (int fd,
void *buf, void *buf,
size_t count, size_t count,
off_t offset) off_t offset)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
ssize_t ret = -1; ssize_t ret = -1;
@ -75,10 +75,10 @@ _sp_pread (int fd,
} }
ssize_t ssize_t
_sp_pwrite (int fd, (_sp_pwrite) (int fd,
const void *buf, const void *buf,
size_t count, size_t count,
off_t offset) off_t offset)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
ssize_t ret = -1; ssize_t ret = -1;
@ -97,9 +97,9 @@ _sp_pwrite (int fd,
} }
ssize_t ssize_t
_sp_write (int fd, (_sp_write) (int fd,
const void *buf, const void *buf,
size_t count) size_t count)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
ssize_t ret = -1; ssize_t ret = -1;
@ -117,7 +117,7 @@ _sp_write (int fd,
} }
gint32 gint32
_sp_getpid (void) (_sp_getpid) (void)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
return _getpid (); return _getpid ();
@ -127,10 +127,10 @@ _sp_getpid (void)
} }
ssize_t ssize_t
_sp_sendfile (int out_fd, (_sp_sendfile) (int out_fd,
int in_fd, int in_fd,
off_t *offset, off_t *offset,
size_t count) size_t count)
{ {
ssize_t total = 0; ssize_t total = 0;
off_t wpos = 0; off_t wpos = 0;