From b92c6bcb136f1266cccf5769ea117ed5e5f190fe Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 19 Apr 2014 12:22:37 +0000
Subject: unifdef ENOTDIR, everyone has it

---
 src/lib/libssl/src/apps/apps.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index 9a731fe75b..2035d51373 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/lib/libssl/src/apps/apps.c
@@ -1503,11 +1503,7 @@ rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)
 	BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
 	    serialfile, buf[1]);
 #endif
-	if (rename(serialfile, buf[1]) < 0 && errno != ENOENT
-#ifdef ENOTDIR
-	    && errno != ENOTDIR
-#endif
-	    ) {
+	if (rename(serialfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) {
 		BIO_printf(bio_err,
 		    "unable to rename %s to %s\n",
 		    serialfile, buf[1]);
@@ -1723,11 +1719,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix)
 	BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
 	    dbfile, buf[1]);
 #endif
-	if (rename(dbfile, buf[1]) < 0 && errno != ENOENT
-#ifdef ENOTDIR
-	    && errno != ENOTDIR
-#endif
-	    ) {
+	if (rename(dbfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) {
 		BIO_printf(bio_err,
 		    "unable to rename %s to %s\n",
 		    dbfile, buf[1]);
@@ -1750,11 +1742,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix)
 	BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
 	    buf[4], buf[3]);
 #endif
-	if (rename(buf[4], buf[3]) < 0 && errno != ENOENT
-#ifdef ENOTDIR
-	    && errno != ENOTDIR
-#endif
-	    ) {
+	if (rename(buf[4], buf[3]) < 0 && errno != ENOENT && errno != ENOTDIR) {
 		BIO_printf(bio_err,
 		    "unable to rename %s to %s\n",
 		    buf[4], buf[3]);
-- 
cgit v1.2.3-55-g6feb