diff options
| author | jsing <> | 2014-05-18 16:34:04 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-18 16:34:04 +0000 |
| commit | 9f521854d044a6d605c113329d3a30783cc697de (patch) | |
| tree | 974e53adfd905034ceaa4d8b9aa1f6cb29926a08 /src/lib/libssl/src | |
| parent | bb42a51302d657d5eca4fa411f048c92c220a606 (diff) | |
| download | openbsd-9f521854d044a6d605c113329d3a30783cc697de.tar.gz openbsd-9f521854d044a6d605c113329d3a30783cc697de.tar.bz2 openbsd-9f521854d044a6d605c113329d3a30783cc697de.zip | |
W_OK comes via unistd.h - nuke several #ifndef W_OK that attempt to handle
missing defines.
Diffstat (limited to 'src/lib/libssl/src')
| -rw-r--r-- | src/lib/libssl/src/apps/ca.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c index 23c1318699..59f1969023 100644 --- a/src/lib/libssl/src/apps/ca.c +++ b/src/lib/libssl/src/apps/ca.c | |||
| @@ -60,10 +60,6 @@ | |||
| 60 | 60 | ||
| 61 | #include <sys/types.h> | 61 | #include <sys/types.h> |
| 62 | 62 | ||
| 63 | #ifndef W_OK | ||
| 64 | #include <sys/file.h> | ||
| 65 | #endif | ||
| 66 | |||
| 67 | #include <ctype.h> | 63 | #include <ctype.h> |
| 68 | #include <stdio.h> | 64 | #include <stdio.h> |
| 69 | #include <stdlib.h> | 65 | #include <stdlib.h> |
| @@ -84,18 +80,11 @@ | |||
| 84 | #include <openssl/x509.h> | 80 | #include <openssl/x509.h> |
| 85 | #include <openssl/x509v3.h> | 81 | #include <openssl/x509v3.h> |
| 86 | 82 | ||
| 87 | #ifndef W_OK | 83 | #define BASE_SECTION "ca" |
| 88 | #define F_OK 0 | ||
| 89 | #define X_OK 1 | ||
| 90 | #define W_OK 2 | ||
| 91 | #define R_OK 4 | ||
| 92 | #endif | ||
| 93 | |||
| 94 | #define BASE_SECTION "ca" | ||
| 95 | 84 | ||
| 96 | #define ENV_DEFAULT_CA "default_ca" | 85 | #define ENV_DEFAULT_CA "default_ca" |
| 97 | 86 | ||
| 98 | #define STRING_MASK "string_mask" | 87 | #define STRING_MASK "string_mask" |
| 99 | #define UTF8_IN "utf8" | 88 | #define UTF8_IN "utf8" |
| 100 | 89 | ||
| 101 | #define ENV_DIR "dir" | 90 | #define ENV_DIR "dir" |
