Remove cplusplus guards in internal headers
authorMatt Caswell <matt@openssl.org>
Thu, 1 Feb 2018 14:17:38 +0000 (14:17 +0000)
committerMatt Caswell <matt@openssl.org>
Tue, 20 Feb 2018 12:59:30 +0000 (12:59 +0000)
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)

crypto/ec/curve448/curve448utils.h
crypto/ec/curve448/ed448.h
crypto/ec/curve448/point_448.h

index 91fea6a..2243889 100644 (file)
 
 # include <openssl/e_os2.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Internal word types. Somewhat tricky.  This could be decided separately per
  * platform.  However, the structs do need to be all the same size and
@@ -79,8 +75,4 @@ static ossl_inline c448_error_t c448_succeed_if(c448_bool_t x)
     return (c448_error_t) x;
 }
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif                          /* __C448_COMMON_H__ */
index 303443d..eec6629 100644 (file)
 
 # include "point_448.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Number of bytes in an EdDSA public key. */
 # define EDDSA_448_PUBLIC_BYTES 57
 
@@ -200,8 +196,4 @@ c448_error_t c448_ed448_convert_private_key_to_x448(
                             uint8_t x[X448_PRIVATE_BYTES],
                             const uint8_t ed[EDDSA_448_PRIVATE_BYTES]);
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif                          /* __C448_ED448_H__ */
index 8b7aacd..90a7c3b 100644 (file)
@@ -16,9 +16,6 @@
 # include "curve448utils.h"
 # include "field.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 # define C448_SCALAR_LIMBS ((446-1)/C448_WORD_BITS+1)
 
@@ -283,8 +280,4 @@ void curve448_scalar_destroy(curve448_scalar_t scalar);
 /* Overwrite point with zeros. */
 void curve448_point_destroy(curve448_point_t point);
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif                          /* __C448_POINT_448_H__ */