diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/compatibility.cc (renamed from kernel/posix_compatibility.cc) | 7 | ||||
| -rw-r--r-- | kernel/compatibility.h (renamed from kernel/posix_compatibility.h) | 22 | ||||
| -rw-r--r-- | kernel/log.cc | 1 | ||||
| -rw-r--r-- | kernel/register.cc | 5 | ||||
| -rw-r--r-- | kernel/rtlil.cc | 1 |
5 files changed, 18 insertions, 18 deletions
diff --git a/kernel/posix_compatibility.cc b/kernel/compatibility.cc index d3fb00873..2ef023eb3 100644 --- a/kernel/posix_compatibility.cc +++ b/kernel/compatibility.cc @@ -27,6 +27,7 @@ #include <errno.h> #if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L) + typedef struct memstream { off_t pos; off_t size; @@ -110,7 +111,7 @@ static int memstream_close (void * cookie) return 0; } -FILE * fmemopen (void * buf, size_t size, const char * mode) +FILE * compat_fmemopen (void * buf, size_t size, const char * mode) { memstream_t * mem = (memstream_t *) malloc(sizeof(memstream_t)); memset(mem, 0, sizeof(memstream_t)); @@ -120,7 +121,7 @@ FILE * fmemopen (void * buf, size_t size, const char * mode) return funopen(mem, memstream_read, memstream_write, memstream_seek, memstream_close); } -FILE * open_memstream (char ** bufp, size_t * sizep) +FILE * compat_open_memstream (char ** bufp, size_t * sizep) { memstream_t * mem = (memstream_t *) malloc(sizeof(memstream_t)); memset(mem, 0, sizeof(memstream_t)); @@ -130,5 +131,5 @@ FILE * open_memstream (char ** bufp, size_t * sizep) return funopen(mem, memstream_read, memstream_write, memstream_seek, memstream_close); } -#endif +#endif /* !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L) */ diff --git a/kernel/posix_compatibility.h b/kernel/compatibility.h index ed8fc8966..58e0b52e9 100644 --- a/kernel/posix_compatibility.h +++ b/kernel/compatibility.h @@ -17,24 +17,20 @@ * */ -#ifndef POSIX_COMPATIBILITY_H -#define POSIX_COMPATIBILITY_H - -#if defined(__cplusplus) -extern "C" { -#endif +#ifndef COMPATIBILITY_H +#define COMPATIBILITY_H #if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L) #include <stdio.h> #include <stdlib.h> -FILE * open_memstream (char ** bufp, size_t * sizep); -FILE * fmemopen (void * buf, size_t size, const char * mode); -#endif +#define open_memstream compat_open_memstream +#define fmemopen compat_fmemopen + +FILE * compat_open_memstream (char ** bufp, size_t * sizep); +FILE * compat_fmemopen (void * buf, size_t size, const char * mode); -#if defined(__cplusplus) -} -#endif +#endif /* !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L) */ -#endif +#endif /* COMPATIBILITY_H */ diff --git a/kernel/log.cc b/kernel/log.cc index 779f93737..b2c92e4e1 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -18,6 +18,7 @@ */ #include "kernel/log.h" +#include "kernel/compatibility.h" #include "backends/ilang/ilang_backend.h" #include <sys/time.h> diff --git a/kernel/register.cc b/kernel/register.cc index ab5cba11b..511afaac0 100644 --- a/kernel/register.cc +++ b/kernel/register.cc @@ -17,8 +17,9 @@ * */ -#include "register.h" -#include "log.h" +#include "kernel/compatibility.h" +#include "kernel/register.h" +#include "kernel/log.h" #include <assert.h> #include <string.h> #include <stdlib.h> diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc index 21fcae2b5..7259845a0 100644 --- a/kernel/rtlil.cc +++ b/kernel/rtlil.cc @@ -17,6 +17,7 @@ * */ +#include "kernel/compatibility.h" #include "kernel/rtlil.h" #include "kernel/log.h" #include "frontends/verilog/verilog_frontend.h" |