diff options
| author | Jack Lloyd <[email protected]> | 2018-01-09 10:07:31 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-01-09 10:07:31 -0500 |
| commit | 92749094c285d14a683b490042d79a960991490c (patch) | |
| tree | f31e6c7a144c2f8c1ac2b8e323de7c5c0a819f71 /src/lib/entropy | |
| parent | d220c13939be5102b7916d36c1031b77a07f972c (diff) | |
| parent | f0575ecf644a583afb491d14df1f7b03dae7bd32 (diff) | |
Merge GH #1378 Use OS feature flags instead of OS name for enabling system specific code
Diffstat (limited to 'src/lib/entropy')
| -rw-r--r-- | src/lib/entropy/darwin_secrandom/info.txt | 7 | ||||
| -rw-r--r-- | src/lib/entropy/dev_random/info.txt | 19 | ||||
| -rw-r--r-- | src/lib/entropy/getentropy/info.txt | 6 | ||||
| -rw-r--r-- | src/lib/entropy/proc_walk/info.txt | 16 | ||||
| -rw-r--r-- | src/lib/entropy/win32_stats/info.txt | 8 |
5 files changed, 15 insertions, 41 deletions
diff --git a/src/lib/entropy/darwin_secrandom/info.txt b/src/lib/entropy/darwin_secrandom/info.txt index 477818818..c1943a04a 100644 --- a/src/lib/entropy/darwin_secrandom/info.txt +++ b/src/lib/entropy/darwin_secrandom/info.txt @@ -6,10 +6,9 @@ ENTROPY_SRC_DARWIN_SECRANDOM -> 20150925 darwin_secrandom.h </header:internal> -<os> -darwin -ios -</os> +<os_features> +security_framework +</os_features> <frameworks> darwin -> Security diff --git a/src/lib/entropy/dev_random/info.txt b/src/lib/entropy/dev_random/info.txt index d22f18211..3872411f3 100644 --- a/src/lib/entropy/dev_random/info.txt +++ b/src/lib/entropy/dev_random/info.txt @@ -6,19 +6,6 @@ ENTROPY_SRC_DEV_RANDOM -> 20131128 dev_random.h </header:internal> -<os> -aix -android -cygwin -darwin -dragonfly -freebsd -haiku -hpux -hurd -linux -netbsd -openbsd -qnx -solaris -</os> +<os_features> +dev_random,posix1 +</os_features> diff --git a/src/lib/entropy/getentropy/info.txt b/src/lib/entropy/getentropy/info.txt index a44299cbe..886e57151 100644 --- a/src/lib/entropy/getentropy/info.txt +++ b/src/lib/entropy/getentropy/info.txt @@ -6,6 +6,6 @@ ENTROPY_SRC_GETENTROPY -> 20170327 getentropy.h </header:internal> -<os> -openbsd -</os> +<os_features> +getentropy +</os_features> diff --git a/src/lib/entropy/proc_walk/info.txt b/src/lib/entropy/proc_walk/info.txt index f93d0cb3f..2bba7e276 100644 --- a/src/lib/entropy/proc_walk/info.txt +++ b/src/lib/entropy/proc_walk/info.txt @@ -6,16 +6,6 @@ ENTROPY_SRC_PROC_WALKER -> 20131128 proc_walk.h </header:internal> -<os> -android -aix -cygwin -darwin -dragonfly -hpux -hurd -linux -netbsd -qnx -solaris -</os> +<os_features> +posix1,proc_fs +</os_features> diff --git a/src/lib/entropy/win32_stats/info.txt b/src/lib/entropy/win32_stats/info.txt index 7c84fc235..68abae34e 100644 --- a/src/lib/entropy/win32_stats/info.txt +++ b/src/lib/entropy/win32_stats/info.txt @@ -6,11 +6,9 @@ ENTROPY_SRC_WIN32 -> 20131128 es_win32.h </header:internal> -<os> -windows -cygwin -mingw -</os> +<os_features> +win32 +</os_features> <libs> windows -> user32.lib |