From: jsing <jsing@openbsd.org>
Date: Sun, 18 May 2014 16:34:04 +0000 (+0000)
Subject: W_OK comes via unistd.h - nuke several #ifndef W_OK that attempt to handle
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7e07e9b1e8005f165d9128779eb8a0990d1700be;p=openbsd

W_OK comes via unistd.h - nuke several #ifndef W_OK that attempt to handle
missing defines.
---

diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index 23c13186995..59f19690237 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -60,10 +60,6 @@
 
 #include <sys/types.h>
 
-#ifndef W_OK
-#include <sys/file.h>
-#endif
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -84,18 +80,11 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#ifndef W_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif
-
-#define BASE_SECTION	"ca"
+#define BASE_SECTION		"ca"
 
 #define ENV_DEFAULT_CA		"default_ca"
 
-#define STRING_MASK	"string_mask"
+#define STRING_MASK		"string_mask"
 #define UTF8_IN			"utf8"
 
 #define ENV_DIR			"dir"