generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tighten up compat include paths, fix glibc compatibility

Browse Source
This commit is contained in:
Brent Cook 2015-07-21 12:04:07 -06:00
parent 5d8a1cf715
commit cbdc8ca820
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/compat/stdlib.h
View File

@ -3,18 +3,16 @@
* Public domain * Public domain
*/ */
#ifndef LIBCRYPTOCOMPAT_STDLIB_H
#define LIBCRYPTOCOMPAT_STDLIB_H
#ifdef _MSC_VER #ifdef _MSC_VER
#include <../include/stdlib.h> #include <../include/stdlib.h>
#else #else
#include_next <stdlib.h> #include_next <stdlib.h>
#endif #endif
#ifndef LIBCRYPTOCOMPAT_STDLIB_H
#define LIBCRYPTOCOMPAT_STDLIB_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
//#include <sys/time.h>
#include <stdint.h> #include <stdint.h>
#ifndef HAVE_ARC4RANDOM_BUF #ifndef HAVE_ARC4RANDOM_BUF

7
include/compat/sys/stat.h
View File

@ -6,7 +6,10 @@
#ifndef LIBCRYPTOCOMPAT_SYS_STAT_H #ifndef LIBCRYPTOCOMPAT_SYS_STAT_H
#define LIBCRYPTOCOMPAT_SYS_STAT_H #define LIBCRYPTOCOMPAT_SYS_STAT_H
#ifdef _MSC_VER #ifndef _MSC_VER
#include_next <sys/stat.h>
#else
#include <windows.h> #include <windows.h>
#include <../include/sys/stat.h> #include <../include/sys/stat.h>
@ -88,8 +91,6 @@
#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR) #define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) #define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
#else
#include_next <sys/stat.h>
#endif #endif
#endif #endif

6
include/compat/sys/types.h
View File

@ -3,15 +3,15 @@
* sys/types.h compatibility shim * sys/types.h compatibility shim
*/ */
#ifndef LIBCRYPTOCOMPAT_SYS_TYPES_H
#define LIBCRYPTOCOMPAT_SYS_TYPES_H
#ifdef _MSC_VER #ifdef _MSC_VER
#include <../include/sys/types.h> #include <../include/sys/types.h>
#else #else
#include_next <sys/types.h> #include_next <sys/types.h>
#endif #endif
#ifndef LIBCRYPTOCOMPAT_SYS_TYPES_H
#define LIBCRYPTOCOMPAT_SYS_TYPES_H
#include <stdint.h> #include <stdint.h>
#ifdef __MINGW32__ #ifdef __MINGW32__

5
include/compat/time.h
View File

@ -3,14 +3,9 @@
* sys/time.h compatibility shim * sys/time.h compatibility shim
*/ */
#ifndef LIBCRYPTOCOMPAT_TIME_H
#define LIBCRYPTOCOMPAT_TIME_H
#ifdef _MSC_VER #ifdef _MSC_VER
#include <../include/time.h> #include <../include/time.h>
#define gmtime_r(tp, tm) ((gmtime_s((tm), (tp)) == 0) ? (tm) : NULL) #define gmtime_r(tp, tm) ((gmtime_s((tm), (tp)) == 0) ? (tm) : NULL)
#else #else
#include_next <time.h> #include_next <time.h>
#endif #endif
#endif