From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 7 May 2015 11:23:37 +0000 (+0200)
Subject: crypto: fix cmake error '#elif with no expression'
X-Git-Tag: v9.0.2~223^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67e2caa6fe96d14c2d722156fb47fe1857e06720;p=ceph.git

crypto: fix cmake error '#elif with no expression'

It needs to be '#elif defined()' to work with cmake.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index 5223f5a48e88..24c4bd0d5617 100644
--- a/src/auth/Crypto.cc
+++ b/src/auth/Crypto.cc
@@ -17,7 +17,7 @@
 # include <cryptopp/modes.h>
 # include <cryptopp/aes.h>
 # include <cryptopp/filters.h>
-#elif USE_NSS
+#elif defined(USE_NSS)
 # include <nspr.h>
 # include <nss.h>
 # include <pk11pub.h>
@@ -197,7 +197,7 @@ public:
   }
 };
 
-#elif USE_NSS
+#elif defined(USE_NSS)
 // when we say AES, we mean AES-128
 # define AES_KEY_LEN	16
 # define AES_BLOCK_LEN   16
diff --git a/src/common/ceph_crypto.cc b/src/common/ceph_crypto.cc
index eb46672b917a..99c25150dcc1 100644
--- a/src/common/ceph_crypto.cc
+++ b/src/common/ceph_crypto.cc
@@ -35,7 +35,7 @@ ceph::crypto::HMACSHA1::~HMACSHA1()
 {
 }
 
-#elif USE_NSS
+#elif defined(USE_NSS)
 
 // for SECMOD_RestartModules()
 #include <secmod.h>
diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h
index 686efb489612..10055f6bcc50 100644
--- a/src/common/ceph_crypto.h
+++ b/src/common/ceph_crypto.h
@@ -11,9 +11,9 @@
 #ifdef USE_CRYPTOPP
 # define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 #include <string.h>
-# include <cryptopp/md5.h>
-# include <cryptopp/sha.h>
-# include <cryptopp/hmac.h>
+#include <cryptopp/md5.h>
+#include <cryptopp/sha.h>
+#include <cryptopp/hmac.h>
 
 // reinclude our assert to clobber the system one
 # include "include/assert.h"
@@ -38,7 +38,7 @@ namespace ceph {
     };
   }
 }
-#elif USE_NSS
+#elif defined(USE_NSS)
 // you *must* use CRYPTO_CXXFLAGS in Makefile.am for including this include
 # include <nss.h>
 # include <pk11pub.h>