Commit 34446a85 authored by Nicola Tuveri's avatar Nicola Tuveri Committed by Dr. Matthias St. Pierre
Browse files

Remove __cplusplus preamble from internal headers 



These headers are internal and never exposed to a cpp compiler, hence no
need for the preamble.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/6554)
parent 07e4dc34

crypto/bn/bn_lcl.h

+0 −8
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 


# include "internal/bn_int.h"



#ifdef  __cplusplus

extern "C" {

#endif



/*

 * These preprocessor symbols control various aspects of the bignum headers

 * and library code. They're not defined by any "normal" configuration, as
@@ -659,8 +655,4 @@ static ossl_inline BIGNUM *bn_expand(BIGNUM *a, int bits) 
    return bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2);

}



#ifdef  __cplusplus

}

#endif



#endif

crypto/cms/cms_lcl.h

+0 −7
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
#ifndef HEADER_CMS_LCL_H

# define HEADER_CMS_LCL_H



#ifdef __cplusplus

extern "C" {

#endif



# include <openssl/x509.h>



/*
@@ -438,7 +434,4 @@ DECLARE_ASN1_ITEM(CMS_RevocationInfoChoice) 
DECLARE_ASN1_ITEM(CMS_SignedData)

DECLARE_ASN1_ITEM(CMS_CompressedData)



#ifdef  __cplusplus

}

#endif

#endif

crypto/engine/eng_int.h

+0 −8
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
# include "internal/thread_once.h"

# include "internal/refcount.h"



#ifdef  __cplusplus

extern "C" {

#endif



extern CRYPTO_RWLOCK *global_engine_lock;



/*
@@ -172,8 +168,4 @@ typedef struct st_engine_pile ENGINE_PILE; 


DEFINE_LHASH_OF(ENGINE_PILE);



#ifdef  __cplusplus

}

#endif



#endif                          /* HEADER_ENGINE_INT_H */

crypto/hmac/hmac_lcl.h

+0 −11
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ 
#ifndef HEADER_HMAC_LCL_H

# define HEADER_HMAC_LCL_H



#ifdef  __cplusplus

extern "C" {

#endif

#if 0                            /* emacs indentation fix */

}

#endif



struct hmac_ctx_st {

    const EVP_MD *md;

    EVP_MD_CTX *md_ctx;
@@ -26,8 +19,4 @@ struct hmac_ctx_st { 
    unsigned char key[HMAC_MAX_MD_CBLOCK];

};



#ifdef __cplusplus

} /* extern "C" */

#endif



#endif

crypto/include/internal/aria.h

+0 −8
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
# define ARIA_BLOCK_SIZE    16  /* Size of each encryption/decryption block */

# define ARIA_MAX_KEYS      17  /* Number of keys needed in the worst case  */



# ifdef  __cplusplus

extern "C" {

# endif



typedef union {

    unsigned char c[ARIA_BLOCK_SIZE];

    unsigned int u[ARIA_BLOCK_SIZE / sizeof(unsigned int)];
@@ -51,8 +47,4 @@ int aria_set_decrypt_key(const unsigned char *userKey, const int bits, 
void aria_encrypt(const unsigned char *in, unsigned char *out,

                  const ARIA_KEY *key);



# ifdef  __cplusplus

}

# endif



#endif