X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fopenssl%2Fcamellia.h;h=d05b39254908bf0be9188e6ae9cca0efbd78c76e;hb=c636c1c470fd2b4b0cb546e6ee85971375e42ec1;hp=d04d2a8b3ab8842cc5df2cde0ac52262e5551694;hpb=349807608f31b20af01a342d0072bb92e0b036e2;p=oweals%2Fopenssl.git

diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index d04d2a8b3a..d05b392549 100644
--- a/include/openssl/camellia.h
+++ b/include/openssl/camellia.h
@@ -53,11 +53,11 @@
 
 # include <openssl/opensslconf.h>
 
-# ifdef OPENSSL_NO_CAMELLIA
-#  error CAMELLIA is disabled.
-# endif
-
+# ifndef OPENSSL_NO_CAMELLIA
 # include <stddef.h>
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 # define CAMELLIA_ENCRYPT        1
 # define CAMELLIA_DECRYPT        0
@@ -67,10 +67,6 @@
  * Both sizes are in bytes.
  */
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 /* This should be a hidden type, but EVP requires that the size be known */
 
 # define CAMELLIA_BLOCK_SIZE 16
@@ -120,8 +116,9 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
                              unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
                              unsigned int *num);
 
-#ifdef  __cplusplus
+# ifdef  __cplusplus
 }
-#endif
+# endif
+# endif
 
-#endif                          /* !HEADER_Camellia_H */
+#endif