ASN.1: Remove C++ glue

I might regret this one day.

diff --git a/src/asn1/asn1c/ANY.h b/src/asn1/asn1c/ANY.h
index 0a45217977a7d283e41e2ba8bab16434c8f2ebfc..399f70b11fe30d8afedbfb753285fecf07b4acec 100644 (file)
--- a/src/asn1/asn1c/ANY.h
+++ b/src/asn1/asn1c/ANY.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"   /* Implemented via OCTET STRING type */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ANY {
        uint8_t *buf;   /* BER-encoded ANY contents */
        int size;       /* Size of the above buffer */
@@ -50,8 +46,4 @@ int ANY_to_type(ANY_t *, asn_TYPE_descriptor_t *td, void **struct_ptr);
 #define        ANY_new_fromBuf(buf, size)      OCTET_STRING_new_fromBuf(       \
                                                &asn_DEF_ANY, (buf), (size))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_TYPE_ANY_H */

diff --git a/src/asn1/asn1c/ASId.h b/src/asn1/asn1c/ASId.h
index 7f0c95e8bb392f50ac7c6e067ccccca0f6406db3..eb03c8480446005599576bbaf1a335d81845c37e 100644 (file)
--- a/src/asn1/asn1c/ASId.h
+++ b/src/asn1/asn1c/ASId.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ASId */
 typedef INTEGER_t       ASId_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ASId_decode_ber;
 der_type_encoder_f ASId_encode_der;
 xer_type_encoder_f ASId_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ASId_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ASIdOrRange.h b/src/asn1/asn1c/ASIdOrRange.h
index 1c0b9282625e8b88a0bb6819ddfab9fb703efdc7..87f3dee345e55d8f5a4a425b3a25c76483a5dcf0 100644 (file)
--- a/src/asn1/asn1c/ASIdOrRange.h
+++ b/src/asn1/asn1c/ASIdOrRange.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ASRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum ASIdOrRange_PR {
        ASIdOrRange_PR_NOTHING, /* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ASIdOrRange;
 extern asn_CHOICE_specifics_t asn_SPC_ASIdOrRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASIdOrRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ASIdOrRange_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h
index ec58c81861e07203184f6c14e49935981d7a5492..1f5d7875d437c4620206600c68604dce5d20b924 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.h
+++ b/src/asn1/asn1c/ASIdentifierChoice.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum ASIdentifierChoice_PR {
        ASIdentifierChoice_PR_NOTHING,  /* No components present */
@@ -53,10 +49,6 @@ extern asn_TYPE_descriptor_t asn_DEF_ASIdentifierChoice;
 extern asn_CHOICE_specifics_t asn_SPC_ASIdentifierChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASIdentifierChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ASIdOrRange.h"
 

diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h
index 3e66ab12d49274a5882fec240c98bcc5bcf876fc..bf64f35c1087a589f99708916aad6e1dc08aa8d5 100644 (file)
--- a/src/asn1/asn1c/ASIdentifiers.h
+++ b/src/asn1/asn1c/ASIdentifiers.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ASIdentifierChoice;
 
@@ -33,10 +29,6 @@ typedef struct ASIdentifiers {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ASIdentifiers;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ASIdentifierChoice.h"
 

diff --git a/src/asn1/asn1c/ASRange.h b/src/asn1/asn1c/ASRange.h
index 0e6acfedf221b43cc7020c993165f5d89c0a1621..ac25726fcb96adfdcf84c4bb7d51935e701db44d 100644 (file)
--- a/src/asn1/asn1c/ASRange.h
+++ b/src/asn1/asn1c/ASRange.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ASRange */
 typedef struct ASRange {
        ASId_t   min;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ASRange;
 extern asn_SEQUENCE_specifics_t asn_SPC_ASRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ASRange_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/AlgorithmIdentifier.h b/src/asn1/asn1c/AlgorithmIdentifier.h
index 731276ad7322b94720c638825067dcdd550c609a..bc40e9609bb54f1e54a340fdba0d2ea6a42df0a1 100644 (file)
--- a/src/asn1/asn1c/AlgorithmIdentifier.h
+++ b/src/asn1/asn1c/AlgorithmIdentifier.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AlgorithmIdentifier */
 typedef struct AlgorithmIdentifier {
        OBJECT_IDENTIFIER_t      algorithm;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_AlgorithmIdentifier;
 extern asn_SEQUENCE_specifics_t asn_SPC_AlgorithmIdentifier_specs_1;
 extern asn_TYPE_member_t asn_MBR_AlgorithmIdentifier_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _AlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/AttributeType.h b/src/asn1/asn1c/AttributeType.h
index c80a26251c3fa2b67a3e7b203718d4d610848296..8552996eaa869ca5e24ca1338f1307835186191e 100644 (file)
--- a/src/asn1/asn1c/AttributeType.h
+++ b/src/asn1/asn1c/AttributeType.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeType */
 typedef OBJECT_IDENTIFIER_t     AttributeType_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f AttributeType_decode_ber;
 der_type_encoder_f AttributeType_encode_der;
 xer_type_encoder_f AttributeType_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _AttributeType_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/AttributeTypeAndValue.h b/src/asn1/asn1c/AttributeTypeAndValue.h
index 7096e46d56fe393a003fd8639148945f5301ed80..8c21acca33453dbbed5481efdbf80b8b1101efbb 100644 (file)
--- a/src/asn1/asn1c/AttributeTypeAndValue.h
+++ b/src/asn1/asn1c/AttributeTypeAndValue.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/AttributeValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeTypeAndValue */
 typedef struct AttributeTypeAndValue {
        AttributeType_t  type;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_AttributeTypeAndValue;
 extern asn_SEQUENCE_specifics_t asn_SPC_AttributeTypeAndValue_specs_1;
 extern asn_TYPE_member_t asn_MBR_AttributeTypeAndValue_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _AttributeTypeAndValue_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/AttributeValue.h b/src/asn1/asn1c/AttributeValue.h
index 74c514b12467bbd850d9eb60c0d61b06ab6a176a..d9462dc89c8bd0eb9a0ad0553602055410080d16 100644 (file)
--- a/src/asn1/asn1c/AttributeValue.h
+++ b/src/asn1/asn1c/AttributeValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/ANY.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeValue */
 typedef ANY_t   AttributeValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f AttributeValue_decode_ber;
 der_type_encoder_f AttributeValue_encode_der;
 xer_type_encoder_f AttributeValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _AttributeValue_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/BIT_STRING.h b/src/asn1/asn1c/BIT_STRING.h
index aac8d0cfc7fb7a754666f5941b707b025a7754fa..acac92a82be3fbd43f6c49610362f9c893674614 100644 (file)
--- a/src/asn1/asn1c/BIT_STRING.h
+++ b/src/asn1/asn1c/BIT_STRING.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"   /* Some help from OCTET STRING */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct BIT_STRING_s {
        uint8_t *buf;   /* BIT STRING body */
        size_t size;    /* Size of the above buffer */
@@ -34,8 +30,4 @@ asn_random_fill_f  BIT_STRING_random_fill;
 #define BIT_STRING_decode_ber        OCTET_STRING_decode_ber
 #define BIT_STRING_encode_der        OCTET_STRING_encode_der
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BIT_STRING_H_ */

diff --git a/src/asn1/asn1c/BOOLEAN.h b/src/asn1/asn1c/BOOLEAN.h
index 1b110b98d5c871d9bce3c984e7dc3e040a8bea67..bb9e8a8535f7de9f7c0484c60bd65fec2e655313 100644 (file)
--- a/src/asn1/asn1c/BOOLEAN.h
+++ b/src/asn1/asn1c/BOOLEAN.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * The underlying integer may contain various values, but everything
  * non-zero is capped to 0xff by the DER encoder. The BER decoder may
@@ -31,8 +27,4 @@ asn_random_fill_f  BOOLEAN_random_fill;
 
 #define BOOLEAN_constraint     asn_generic_no_constraint
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BOOLEAN_H_ */

diff --git a/src/asn1/asn1c/BinarySigningTime.h b/src/asn1/asn1c/BinarySigningTime.h
index 7849b97d7b87481299166633d2c2985588e52da1..80507c1fb0f2ba39d81b7d53f0b310b9ff32690a 100644 (file)
--- a/src/asn1/asn1c/BinarySigningTime.h
+++ b/src/asn1/asn1c/BinarySigningTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/BinaryTime.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* BinarySigningTime */
 typedef BinaryTime_t    BinarySigningTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f BinarySigningTime_decode_ber;
 der_type_encoder_f BinarySigningTime_encode_der;
 xer_type_encoder_f BinarySigningTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BinarySigningTime_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/BinaryTime.h b/src/asn1/asn1c/BinaryTime.h
index 3d264b13e54f5514cf8e8b51ebfdb0848d5b53b5..727d03b84362aba5987d909659b83f4411e76e6e 100644 (file)
--- a/src/asn1/asn1c/BinaryTime.h
+++ b/src/asn1/asn1c/BinaryTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* BinaryTime */
 typedef INTEGER_t       BinaryTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f BinaryTime_decode_ber;
 der_type_encoder_f BinaryTime_encode_der;
 xer_type_encoder_f BinaryTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BinaryTime_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CMSAttribute.h b/src/asn1/asn1c/CMSAttribute.h
index 43784a5104db8520e77d500c4ecee9f29b15192e..ad7552bb6a4342f1350fccbce4e5ccc8c92f5f66 100644 (file)
--- a/src/asn1/asn1c/CMSAttribute.h
+++ b/src/asn1/asn1c/CMSAttribute.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSAttribute */
 typedef struct CMSAttribute {
        OBJECT_IDENTIFIER_t      attrType;
@@ -41,9 +37,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CMSAttribute;
 extern asn_SEQUENCE_specifics_t asn_SPC_CMSAttribute_specs_1;
 extern asn_TYPE_member_t asn_MBR_CMSAttribute_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CMSAttribute_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CMSAttributeValue.h b/src/asn1/asn1c/CMSAttributeValue.h
index fc68549ab8a272586d42af7f7fc64169e728751d..8a445f74a5e88ab34ae9fdb9df947adca49e291d 100644 (file)
--- a/src/asn1/asn1c/CMSAttributeValue.h
+++ b/src/asn1/asn1c/CMSAttributeValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/ANY.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSAttributeValue */
 typedef ANY_t   CMSAttributeValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CMSAttributeValue_decode_ber;
 der_type_encoder_f CMSAttributeValue_encode_der;
 xer_type_encoder_f CMSAttributeValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CMSAttributeValue_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
index 8e149ff922157bfbb68ae2654fa4d4804aca39ef..7fe5da2ab96666e6019c5f0beb1d269ee2d78ca3 100644 (file)
--- a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
+++ b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSSubjectKeyIdentifier */
 typedef OCTET_STRING_t  CMSSubjectKeyIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CMSSubjectKeyIdentifier_decode_ber;
 der_type_encoder_f CMSSubjectKeyIdentifier_encode_der;
 xer_type_encoder_f CMSSubjectKeyIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CMSSubjectKeyIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CMSVersion.h b/src/asn1/asn1c/CMSVersion.h
index 2e8044c00f34189aa6561cbd12a7769bafe66df4..05235e7f58589751d0c48315b05cf47400da77d6 100644 (file)
--- a/src/asn1/asn1c/CMSVersion.h
+++ b/src/asn1/asn1c/CMSVersion.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum CMSVersion {
        CMSVersion_v0   = 0,
@@ -40,9 +36,5 @@ ber_type_decoder_f CMSVersion_decode_ber;
 der_type_encoder_f CMSVersion_encode_der;
 xer_type_encoder_f CMSVersion_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CMSVersion_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CertificateList.h b/src/asn1/asn1c/CertificateList.h
index 4e600084a9f8261123a83f20ee7b55c54d535d07..4f2ddfbd555c568deb4ff7d57140f3e428d1ba58 100644 (file)
--- a/src/asn1/asn1c/CertificateList.h
+++ b/src/asn1/asn1c/CertificateList.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateList */
 typedef struct CertificateList {
        TBSCertList_t    tbsCertList;
@@ -36,9 +32,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CertificateList;
 extern asn_SEQUENCE_specifics_t asn_SPC_CertificateList_specs_1;
 extern asn_TYPE_member_t asn_MBR_CertificateList_1[3];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CertificateList_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CertificateSerialNumber.h b/src/asn1/asn1c/CertificateSerialNumber.h
index 3593122f38c7c1148b89766f22454a1a9c1693bc..6851cd017823af3d8805f66e663cfc275d3c328b 100644 (file)
--- a/src/asn1/asn1c/CertificateSerialNumber.h
+++ b/src/asn1/asn1c/CertificateSerialNumber.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateSerialNumber */
 typedef INTEGER_t       CertificateSerialNumber_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CertificateSerialNumber_decode_ber;
 der_type_encoder_f CertificateSerialNumber_encode_der;
 xer_type_encoder_f CertificateSerialNumber_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CertificateSerialNumber_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/CertificateSet.h b/src/asn1/asn1c/CertificateSet.h
index eb1f36893ce053146612a55f6fd4e1aae46d6f53..f5e96d87bc0e777e23172b350c48c38ab009564d 100644 (file)
--- a/src/asn1/asn1c/CertificateSet.h
+++ b/src/asn1/asn1c/CertificateSet.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateSet */
 typedef struct CertificateSet {
        A_SET_OF(ANY_t) list;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CertificateSet;
 extern asn_SET_OF_specifics_t asn_SPC_CertificateSet_specs_1;
 extern asn_TYPE_member_t asn_MBR_CertificateSet_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CertificateSet_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ContentInfo.h b/src/asn1/asn1c/ContentInfo.h
index 655ff0345bdbdf7be8beb6bae2a596c67886c11c..838525ba42694382dabe73a8b6740149ab192e8f 100644 (file)
--- a/src/asn1/asn1c/ContentInfo.h
+++ b/src/asn1/asn1c/ContentInfo.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentInfo */
 typedef struct ContentInfo {
        ContentType_t    contentType;
@@ -32,9 +28,5 @@ typedef struct ContentInfo {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ContentInfo;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ContentInfo_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ContentType.h b/src/asn1/asn1c/ContentType.h
index f3a4f9c4fc269aecfa0038ff5c65b7a830f63474..a03f9a98719df3ed5bc9d9851de0e0768c040e13 100644 (file)
--- a/src/asn1/asn1c/ContentType.h
+++ b/src/asn1/asn1c/ContentType.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentType */
 typedef OBJECT_IDENTIFIER_t     ContentType_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ContentType_decode_ber;
 der_type_encoder_f ContentType_encode_der;
 xer_type_encoder_f ContentType_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ContentType_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ContentTypePKCS7.h b/src/asn1/asn1c/ContentTypePKCS7.h
index 2f19d3c4664b99484ee145eabef1ae007e792729..f09c3d195a1fd0faed8c81c73e39b7cf7457d340 100644 (file)
--- a/src/asn1/asn1c/ContentTypePKCS7.h
+++ b/src/asn1/asn1c/ContentTypePKCS7.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentTypePKCS7 */
 typedef OCTET_STRING_t  ContentTypePKCS7_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ContentTypePKCS7_decode_ber;
 der_type_encoder_f ContentTypePKCS7_encode_der;
 xer_type_encoder_f ContentTypePKCS7_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ContentTypePKCS7_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Countersignature.h b/src/asn1/asn1c/Countersignature.h
index 68a81392da909bd99dfc6d88583475bafc5eb119..cb6cca45525144991c8d1bf37a3d514d1d0a189c 100644 (file)
--- a/src/asn1/asn1c/Countersignature.h
+++ b/src/asn1/asn1c/Countersignature.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/SignerInfo.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Countersignature */
 typedef SignerInfo_t    Countersignature_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f Countersignature_decode_ber;
 der_type_encoder_f Countersignature_encode_der;
 xer_type_encoder_f Countersignature_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _Countersignature_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.h b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
index 1e6357fc25cbb75182ebf4e3d4abec6c865c821a..3e0f636de2ce570877ae6b812538e8f032d02c60 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/AlgorithmIdentifier.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* DigestAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t   DigestAlgorithmIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f DigestAlgorithmIdentifier_decode_ber;
 der_type_encoder_f DigestAlgorithmIdentifier_encode_der;
 xer_type_encoder_f DigestAlgorithmIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _DigestAlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
index b853005dadf4cf6e737575052e3de914afc7f484..86bde70130b238666be03dbbd2cdc3cfb8f1529b 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct DigestAlgorithmIdentifier;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_DigestAlgorithmIdentifiers;
 extern asn_SET_OF_specifics_t asn_SPC_DigestAlgorithmIdentifiers_specs_1;
 extern asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/DigestAlgorithmIdentifier.h"
 

diff --git a/src/asn1/asn1c/DistinguishedName.h b/src/asn1/asn1c/DistinguishedName.h
index df1384e570350500d70506c7e8e67df9fea43dce..602accb1baff2bfdb053b6011b1d64639f4f8559 100644 (file)
--- a/src/asn1/asn1c/DistinguishedName.h
+++ b/src/asn1/asn1c/DistinguishedName.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/RDNSequence.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* DistinguishedName */
 typedef RDNSequence_t   DistinguishedName_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f DistinguishedName_decode_ber;
 der_type_encoder_f DistinguishedName_encode_der;
 xer_type_encoder_f DistinguishedName_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _DistinguishedName_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.h b/src/asn1/asn1c/EncapsulatedContentInfo.h
index 3f9d91d411885d175a582f7903951d06aad1f366..9faa6da6c9338de2ebc28ed490eaca68849f21b9 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfo.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfo.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* EncapsulatedContentInfo */
 typedef struct EncapsulatedContentInfo {
        ContentType_t    eContentType;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_EncapsulatedContentInfo;
 extern asn_SEQUENCE_specifics_t asn_SPC_EncapsulatedContentInfo_specs_1;
 extern asn_TYPE_member_t asn_MBR_EncapsulatedContentInfo_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _EncapsulatedContentInfo_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
index 9b3dd1bb28e179ce0fd2b3b13466d90be9847bcd..fc28c4fdb8482f26ac5b63b9ff78df655b3d3887 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* EncapsulatedContentInfoPKCS7 */
 typedef struct EncapsulatedContentInfoPKCS7 {
        ContentType_t    eContentType;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_EncapsulatedContentInfoPKCS7;
 extern asn_SEQUENCE_specifics_t asn_SPC_EncapsulatedContentInfoPKCS7_specs_1;
 extern asn_TYPE_member_t asn_MBR_EncapsulatedContentInfoPKCS7_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _EncapsulatedContentInfoPKCS7_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Extension.h b/src/asn1/asn1c/Extension.h
index 8ef6e5b59d854a3503bba04bb93a68c87d9e5e16..6b0749a086fc419adf7c45143b02db198970b0c7 100644 (file)
--- a/src/asn1/asn1c/Extension.h
+++ b/src/asn1/asn1c/Extension.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Extension */
 typedef struct Extension {
        OBJECT_IDENTIFIER_t      extnID;
@@ -36,9 +32,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Extension;
 extern asn_SEQUENCE_specifics_t asn_SPC_Extension_specs_1;
 extern asn_TYPE_member_t asn_MBR_Extension_1[3];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _Extension_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h
index dc296149df7126e9fae64ce786a3c35c4d3106cd..10ff33740e956683499dd5768e54bb23e4c14b24 100644 (file)
--- a/src/asn1/asn1c/Extensions.h
+++ b/src/asn1/asn1c/Extensions.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct Extension;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_Extensions;
 extern asn_SET_OF_specifics_t asn_SPC_Extensions_specs_1;
 extern asn_TYPE_member_t asn_MBR_Extensions_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/Extension.h"
 

diff --git a/src/asn1/asn1c/FileAndHash.h b/src/asn1/asn1c/FileAndHash.h
index 48752bc6ff9c0a54d040c41fc52043cfdf86daf9..d61d2a3a5be2947b0a7f885ffd7895f4ce242f60 100644 (file)
--- a/src/asn1/asn1c/FileAndHash.h
+++ b/src/asn1/asn1c/FileAndHash.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* FileAndHash */
 typedef struct FileAndHash {
        IA5String_t      file;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_FileAndHash;
 extern asn_SEQUENCE_specifics_t asn_SPC_FileAndHash_specs_1;
 extern asn_TYPE_member_t asn_MBR_FileAndHash_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _FileAndHash_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/GeneralizedTime.h b/src/asn1/asn1c/GeneralizedTime.h
index 83dd26ca517a0e2320e9fe6337b7c5e12ec8adaf..7a8ad1bbd9e9cfe7db5e000d245adbc9da1c13fb 100644 (file)
--- a/src/asn1/asn1c/GeneralizedTime.h
+++ b/src/asn1/asn1c/GeneralizedTime.h
@@ -9,10 +9,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t GeneralizedTime_t;  /* Implemented via OCTET STRING */
 
 extern asn_TYPE_descriptor_t asn_DEF_GeneralizedTime;
@@ -67,8 +63,4 @@ GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *_optional_gt,
 GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *_optional_gt,
        const struct tm *, int frac_value, int frac_digits);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _GeneralizedTime_H_ */

diff --git a/src/asn1/asn1c/IA5String.h b/src/asn1/asn1c/IA5String.h
index 77ac1682b1d160a3af01edc74e412837365dffbe..2cf64727e34d0454839779a36f1e39bfd3689e39 100644 (file)
--- a/src/asn1/asn1c/IA5String.h
+++ b/src/asn1/asn1c/IA5String.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t IA5String_t;  /* Implemented via OCTET STRING */
 
 /*
@@ -28,8 +24,4 @@ asn_constr_check_f IA5String_constraint;
 #define IA5String_encode_der    OCTET_STRING_encode_der
 #define IA5String_encode_xer    OCTET_STRING_encode_xer_utf8
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IA5String_H_ */

diff --git a/src/asn1/asn1c/INTEGER.h b/src/asn1/asn1c/INTEGER.h
index 952fd082706159035c685660f2b567e9a291e875..9367d05f6a176d4fffd7917e990e401a77f8248b 100644 (file)
--- a/src/asn1/asn1c/INTEGER.h
+++ b/src/asn1/asn1c/INTEGER.h
@@ -8,10 +8,6 @@
 #include "asn1/asn1c/asn_application.h"
 #include "asn1/asn1c/asn_codecs_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef ASN__PRIMITIVE_TYPE_t INTEGER_t;
 
 extern asn_TYPE_descriptor_t asn_DEF_INTEGER;
@@ -92,8 +88,4 @@ enum asn_strtox_result_e asn_strtoumax_lim(const char *str, const char **end,
 const asn_INTEGER_enum_map_t *INTEGER_map_value2enum(
     const asn_INTEGER_specifics_t *specs, long value);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _INTEGER_H_ */

diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h
index 162be7a860448425294f318c1de07fa06f3815a8..3d55e79b51169faa41c6ae51cceb3e2ee4491e0e 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.h
+++ b/src/asn1/asn1c/IPAddrBlocks.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct IPAddressFamily;
 
@@ -33,10 +29,6 @@ typedef struct IPAddrBlocks {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_IPAddrBlocks;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/IPAddressFamily.h"
 

diff --git a/src/asn1/asn1c/IPAddress.h b/src/asn1/asn1c/IPAddress.h
index ece02220cf8e31e284396dac4515acad64dfedc3..bf1731431abbc516b8e0beffabad38738afa7290 100644 (file)
--- a/src/asn1/asn1c/IPAddress.h
+++ b/src/asn1/asn1c/IPAddress.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/BIT_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddress */
 typedef BIT_STRING_t    IPAddress_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f IPAddress_decode_ber;
 der_type_encoder_f IPAddress_encode_der;
 xer_type_encoder_f IPAddress_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IPAddress_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h
index bc6548354ba68594b015bbafc6c43c3ca76a45d7..fc275fb32f67133f3377007c2da6d3bf5bda429e 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.h
+++ b/src/asn1/asn1c/IPAddressChoice.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum IPAddressChoice_PR {
        IPAddressChoice_PR_NOTHING,     /* No components present */
@@ -53,10 +49,6 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressChoice;
 extern asn_CHOICE_specifics_t asn_SPC_IPAddressChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/IPAddressOrRange.h"
 

diff --git a/src/asn1/asn1c/IPAddressFamily.h b/src/asn1/asn1c/IPAddressFamily.h
index a8ed77ccf38e3c892aa8b36f780027a952c06188..3fddc08f35b9f08d020d6d0efd168f0720273dce 100644 (file)
--- a/src/asn1/asn1c/IPAddressFamily.h
+++ b/src/asn1/asn1c/IPAddressFamily.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/IPAddressChoice.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddressFamily */
 typedef struct IPAddressFamily {
        OCTET_STRING_t   addressFamily;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressFamily;
 extern asn_SEQUENCE_specifics_t asn_SPC_IPAddressFamily_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressFamily_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IPAddressFamily_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IPAddressOrRange.h b/src/asn1/asn1c/IPAddressOrRange.h
index 22974db95f5458c7bcabe115e030cfcf8e6c7f27..b6c86ab2ba08030ffeccb5db1a83df1c2897a887 100644 (file)
--- a/src/asn1/asn1c/IPAddressOrRange.h
+++ b/src/asn1/asn1c/IPAddressOrRange.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/IPAddressRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum IPAddressOrRange_PR {
        IPAddressOrRange_PR_NOTHING,    /* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressOrRange;
 extern asn_CHOICE_specifics_t asn_SPC_IPAddressOrRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressOrRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IPAddressOrRange_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IPAddressRange.h b/src/asn1/asn1c/IPAddressRange.h
index 02038e4638cdae9feac2aee8fa25e09c0cbfbb0e..8be2d3ab5274aa73af0dfa7d9a62248ab5efc930 100644 (file)
--- a/src/asn1/asn1c/IPAddressRange.h
+++ b/src/asn1/asn1c/IPAddressRange.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddressRange */
 typedef struct IPAddressRange {
        IPAddress_t      min;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressRange;
 extern asn_SEQUENCE_specifics_t asn_SPC_IPAddressRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IPAddressRange_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.h b/src/asn1/asn1c/IssuerAndSerialNumber.h
index 432120d31b07d077dcc269562774cd9dd06669b0..9198b824b744c81a38b4a34b54f876c0daea35b3 100644 (file)
--- a/src/asn1/asn1c/IssuerAndSerialNumber.h
+++ b/src/asn1/asn1c/IssuerAndSerialNumber.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/CertificateSerialNumber.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IssuerAndSerialNumber */
 typedef struct IssuerAndSerialNumber {
        Name_t   issuer;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IssuerAndSerialNumber;
 extern asn_SEQUENCE_specifics_t asn_SPC_IssuerAndSerialNumber_specs_1;
 extern asn_TYPE_member_t asn_MBR_IssuerAndSerialNumber_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _IssuerAndSerialNumber_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Manifest.h b/src/asn1/asn1c/Manifest.h
index 8eb2bc73e92594e45559aedb75656b112537cb4a..1444ba1830ba4309cf1251f7fa4f58c4112d20fb 100644 (file)
--- a/src/asn1/asn1c/Manifest.h
+++ b/src/asn1/asn1c/Manifest.h
@@ -19,10 +19,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct FileAndHash;
 
@@ -47,10 +43,6 @@ typedef struct Manifest {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_Manifest;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/FileAndHash.h"
 

diff --git a/src/asn1/asn1c/MessageDigest.h b/src/asn1/asn1c/MessageDigest.h
index 4d5f07c5f23bc1872fd7883f79a7e7002ab7154f..0b786db970787d53a331b667c36dde3efd4db66d 100644 (file)
--- a/src/asn1/asn1c/MessageDigest.h
+++ b/src/asn1/asn1c/MessageDigest.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* MessageDigest */
 typedef OCTET_STRING_t  MessageDigest_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f MessageDigest_decode_ber;
 der_type_encoder_f MessageDigest_encode_der;
 xer_type_encoder_f MessageDigest_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _MessageDigest_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/NULL.h b/src/asn1/asn1c/NULL.h
index 40c93b8f9ec5f7d2007ebbea13e941fd142539ff..f6b877aae3aeba83faa10c044ed2953e98f32a0f 100644 (file)
--- a/src/asn1/asn1c/NULL.h
+++ b/src/asn1/asn1c/NULL.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * The value of the NULL type is meaningless.
  * Use the BOOLEAN type if you need to carry true/false semantics.
@@ -30,8 +26,4 @@ asn_random_fill_f  NULL_random_fill;
 
 #define NULL_constraint        asn_generic_no_constraint
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* NULL_H */

diff --git a/src/asn1/asn1c/Name.h b/src/asn1/asn1c/Name.h
index c6a1b25b47f7107f6cd1abf51331634363f11957..a543aca57f233126d8b42cb9579cf62288cab51e 100644 (file)
--- a/src/asn1/asn1c/Name.h
+++ b/src/asn1/asn1c/Name.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/RDNSequence.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Name_PR {
        Name_PR_NOTHING,        /* No components present */
@@ -41,9 +37,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Name;
 extern asn_CHOICE_specifics_t asn_SPC_Name_specs_1;
 extern asn_TYPE_member_t asn_MBR_Name_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _Name_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.h b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
index 155283ae6f3e05318cc28dff62df5d6a292d29d9..c210cb5b324cd3cf461e40a77b56bd1df48ecdbf 100644 (file)
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.h
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
@@ -9,10 +9,6 @@
 #include "asn1/asn1c/asn_codecs_prim.h"
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef uint32_t asn_oid_arc_t;
 #define ASN_OID_ARC_MAX (~((asn_oid_arc_t)0))
 
@@ -142,8 +138,4 @@ ssize_t OBJECT_IDENTIFIER_get_single_arc(const uint8_t *arcbuf,
 ssize_t OBJECT_IDENTIFIER_set_single_arc(uint8_t *arcbuf, size_t arcbuf_len,
                                          asn_oid_arc_t arc_value);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _OBJECT_IDENTIFIER_H_ */

diff --git a/src/asn1/asn1c/OCTET_STRING.h b/src/asn1/asn1c/OCTET_STRING.h
index 2d1a7181f99d324a610f15c275d3c1b0f87c6720..d12b5a61d2a52951290f3014c3f7c767cb7781d8 100644 (file)
--- a/src/asn1/asn1c/OCTET_STRING.h
+++ b/src/asn1/asn1c/OCTET_STRING.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Note: Though this sometimes represents an actual string, I don't see any
  * guarantees of a NULL character.
@@ -93,8 +89,4 @@ size_t OCTET_STRING_random_length_constrained(
     const asn_TYPE_descriptor_t *, const asn_encoding_constraints_t *,
     size_t max_length);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _OCTET_STRING_H_ */

diff --git a/src/asn1/asn1c/OPEN_TYPE.h b/src/asn1/asn1c/OPEN_TYPE.h
index 721bc786662759c9bed1fdd7cc7c9aacd9dd5a00..5913ab1b01f1240dfb8414408746bfa7f7724769 100644 (file)
--- a/src/asn1/asn1c/OPEN_TYPE.h
+++ b/src/asn1/asn1c/OPEN_TYPE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define OPEN_TYPE_free CHOICE_free
 #define OPEN_TYPE_print CHOICE_print
 #define OPEN_TYPE_compare CHOICE_compare
@@ -31,8 +27,4 @@ asn_dec_rval_t OPEN_TYPE_ber_get(const asn_codec_ctx_t *opt_codec_ctx,
                                  const asn_TYPE_member_t *element,
                                  const void *ptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_OPEN_TYPE_H */

diff --git a/src/asn1/asn1c/OtherRevocationInfoFormat.h b/src/asn1/asn1c/OtherRevocationInfoFormat.h
index 4fc1ec2e2008e44da41732fe104e04911584bcdf..f5db354a7a593f99f3a219e56b5d713e5e8b0ff5 100644 (file)
--- a/src/asn1/asn1c/OtherRevocationInfoFormat.h
+++ b/src/asn1/asn1c/OtherRevocationInfoFormat.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* OtherRevocationInfoFormat */
 typedef struct OtherRevocationInfoFormat {
        OBJECT_IDENTIFIER_t      otherRevInfoFormat;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_OtherRevocationInfoFormat;
 extern asn_SEQUENCE_specifics_t asn_SPC_OtherRevocationInfoFormat_specs_1;
 extern asn_TYPE_member_t asn_MBR_OtherRevocationInfoFormat_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _OtherRevocationInfoFormat_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h
index dea5d4f548670e38616c35ccac47a5e9139e0913..ee9cbe7817c776f1cc982fb466addd0605b2dc61 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.h
+++ b/src/asn1/asn1c/RDNSequence.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct RelativeDistinguishedName;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RDNSequence;
 extern asn_SET_OF_specifics_t asn_SPC_RDNSequence_specs_1;
 extern asn_TYPE_member_t asn_MBR_RDNSequence_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/RelativeDistinguishedName.h"
 

diff --git a/src/asn1/asn1c/ROAIPAddress.h b/src/asn1/asn1c/ROAIPAddress.h
index 49e7b86fe8eb650f4d76c26e12c5d107122c6875..42d9fdc4580a9d8975b3f36c1b1e065fa335347a 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddress.h
+++ b/src/asn1/asn1c/ROAIPAddress.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ROAIPAddress */
 typedef struct ROAIPAddress {
        IPAddress_t      address;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ROAIPAddress;
 extern asn_SEQUENCE_specifics_t asn_SPC_ROAIPAddress_specs_1;
 extern asn_TYPE_member_t asn_MBR_ROAIPAddress_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ROAIPAddress_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h
index dcd570ea25d8a55ad22dd9d9826bb5e98731e4af..fabd266e983d3758185aaa164407627496f42741 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.h
+++ b/src/asn1/asn1c/ROAIPAddressFamily.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ROAIPAddress;
 
@@ -43,10 +39,6 @@ extern asn_TYPE_descriptor_t asn_DEF_ROAIPAddressFamily;
 extern asn_SEQUENCE_specifics_t asn_SPC_ROAIPAddressFamily_specs_1;
 extern asn_TYPE_member_t asn_MBR_ROAIPAddressFamily_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ROAIPAddress.h"
 

diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h
index 6dcec988d1abe7690c80828701159850832eadce..1ddd5661bf0c2594d01880cbbaaaa889f98c4c6c 100644 (file)
--- a/src/asn1/asn1c/RelativeDistinguishedName.h
+++ b/src/asn1/asn1c/RelativeDistinguishedName.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct AttributeTypeAndValue;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName;
 extern asn_SET_OF_specifics_t asn_SPC_RelativeDistinguishedName_specs_1;
 extern asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/AttributeTypeAndValue.h"
 

diff --git a/src/asn1/asn1c/RevocationInfoChoice.h b/src/asn1/asn1c/RevocationInfoChoice.h
index 8df702e17d1f2b757d2d64cbcd4a110aebcf5a85..26576a83460361c8d2b408432c7ea011162503be 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoice.h
+++ b/src/asn1/asn1c/RevocationInfoChoice.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/OtherRevocationInfoFormat.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum RevocationInfoChoice_PR {
        RevocationInfoChoice_PR_NOTHING,        /* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_RevocationInfoChoice;
 extern asn_CHOICE_specifics_t asn_SPC_RevocationInfoChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_RevocationInfoChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _RevocationInfoChoice_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h
index bff280a31f2d2a0b2d1e70a918d9c9958e37b345..342fbbff000e1c2d7d99d2b56a950ab2f01ea347 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoices.h
+++ b/src/asn1/asn1c/RevocationInfoChoices.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct RevocationInfoChoice;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RevocationInfoChoices;
 extern asn_SET_OF_specifics_t asn_SPC_RevocationInfoChoices_specs_1;
 extern asn_TYPE_member_t asn_MBR_RevocationInfoChoices_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/RevocationInfoChoice.h"
 

diff --git a/src/asn1/asn1c/RouteOriginAttestation.h b/src/asn1/asn1c/RouteOriginAttestation.h
index f8dc17fbf98e0b3df53ecfbfff2b08d0efd0ef3b..a5a0722988b798f7087bddd9df84bde012fb90bc 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.h
+++ b/src/asn1/asn1c/RouteOriginAttestation.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ROAIPAddressFamily;
 
@@ -43,10 +39,6 @@ typedef struct RouteOriginAttestation {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_RouteOriginAttestation;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ROAIPAddressFamily.h"
 

diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
index 968d9c8ac78eb6259812e1a33e35b4b6441ea49d..9a725150efbd20a81801b0d20b0c868161098ac7 100644 (file)
--- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/AlgorithmIdentifier.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SignatureAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t   SignatureAlgorithmIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SignatureAlgorithmIdentifier_decode_ber;
 der_type_encoder_f SignatureAlgorithmIdentifier_encode_der;
 xer_type_encoder_f SignatureAlgorithmIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _SignatureAlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignatureValue.h b/src/asn1/asn1c/SignatureValue.h
index ed5dd8c455eed840e58b4260f6de594329c47322..20c7b65f2614a0eba23596d61ca457888fa5f4af 100644 (file)
--- a/src/asn1/asn1c/SignatureValue.h
+++ b/src/asn1/asn1c/SignatureValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SignatureValue */
 typedef OCTET_STRING_t  SignatureValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SignatureValue_decode_ber;
 der_type_encoder_f SignatureValue_encode_der;
 xer_type_encoder_f SignatureValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _SignatureValue_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h
index c32d05ee8660fa858c175f58d182430ed99db898..fb97588fa43fa9c6bf05f2509231d1636d044a77 100644 (file)
--- a/src/asn1/asn1c/SignedAttributes.h
+++ b/src/asn1/asn1c/SignedAttributes.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CMSAttribute;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignedAttributes;
 extern asn_SET_OF_specifics_t asn_SPC_SignedAttributes_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignedAttributes_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CMSAttribute.h"
 

diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h
index f527eb294cfd024285064b88d9fb3bd25f0d0d0b..5c3e4fec7a1cb09234c89aa80a86bd44b8dd4f6b 100644 (file)
--- a/src/asn1/asn1c/SignedData.h
+++ b/src/asn1/asn1c/SignedData.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CertificateSet;
 struct RevocationInfoChoices;
@@ -42,10 +38,6 @@ typedef struct SignedData {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_SignedData;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"

diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h
index bc80e8e2ebe0bd3332aa204b89d80d46fef519c9..df4f9e6fe21a51bf41ae1754ccb31372e7ad25ce 100644 (file)
--- a/src/asn1/asn1c/SignedDataPKCS7.h
+++ b/src/asn1/asn1c/SignedDataPKCS7.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CertificateSet;
 struct RevocationInfoChoices;
@@ -42,10 +38,6 @@ typedef struct SignedDataPKCS7 {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_SignedDataPKCS7;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"

diff --git a/src/asn1/asn1c/SignerIdentifier.h b/src/asn1/asn1c/SignerIdentifier.h
index a465dc753ea5c6b926d10e4ce8f8cf701806e4fc..60edd2938b0263a963cb3673f7b4247dd0dc80b6 100644 (file)
--- a/src/asn1/asn1c/SignerIdentifier.h
+++ b/src/asn1/asn1c/SignerIdentifier.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/CMSSubjectKeyIdentifier.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum SignerIdentifier_PR {
        SignerIdentifier_PR_NOTHING,    /* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerIdentifier;
 extern asn_CHOICE_specifics_t asn_SPC_SignerIdentifier_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerIdentifier_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _SignerIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h
index 9ef08085dc24d183364d3942ee34704abcee5f12..ff1a74917fcedfc52ae9f56822fdd319f1657f0a 100644 (file)
--- a/src/asn1/asn1c/SignerInfo.h
+++ b/src/asn1/asn1c/SignerInfo.h
@@ -19,10 +19,6 @@
 #include "asn1/asn1c/SignatureValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct SignedAttributes;
 struct UnsignedAttributes;
@@ -46,10 +42,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerInfo;
 extern asn_SEQUENCE_specifics_t asn_SPC_SignerInfo_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerInfo_1[7];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/SignedAttributes.h"
 #include "asn1/asn1c/UnsignedAttributes.h"

diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h
index fbcdc4690505631b314f1d15a1e0441be3600475..977ec0132dc9f9415dbdb23d1823a69c542a9603 100644 (file)
--- a/src/asn1/asn1c/SignerInfos.h
+++ b/src/asn1/asn1c/SignerInfos.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct SignerInfo;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerInfos;
 extern asn_SET_OF_specifics_t asn_SPC_SignerInfos_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerInfos_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/SignerInfo.h"
 

diff --git a/src/asn1/asn1c/SigningTime.h b/src/asn1/asn1c/SigningTime.h
index 25991ea7a4fa523eae38d84f1d335bc62913ca6e..9e94881e6c94c222c20b3ab27e83643a17622d51 100644 (file)
--- a/src/asn1/asn1c/SigningTime.h
+++ b/src/asn1/asn1c/SigningTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/Time.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SigningTime */
 typedef Time_t  SigningTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SigningTime_decode_ber;
 der_type_encoder_f SigningTime_encode_der;
 xer_type_encoder_f SigningTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _SigningTime_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h
index 4425e44f1e170b0818d2554cc537f5a952dc608d..844b560f04329d2bfef3f9a89b9df42c0053d3eb 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.h
+++ b/src/asn1/asn1c/TBSCertList.h
@@ -21,10 +21,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct Time;
 struct Extensions;
@@ -63,10 +59,6 @@ extern asn_TYPE_descriptor_t asn_DEF_TBSCertList;
 extern asn_SEQUENCE_specifics_t asn_SPC_TBSCertList_specs_1;
 extern asn_TYPE_member_t asn_MBR_TBSCertList_1[7];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/Time.h"
 #include "asn1/asn1c/Extensions.h"

diff --git a/src/asn1/asn1c/Time.h b/src/asn1/asn1c/Time.h
index 3853d0832eca8a696cf15e114d3ae990d9214d47..413c957e4d8505c4ac681fc6f52c142d95bbecca 100644 (file)
--- a/src/asn1/asn1c/Time.h
+++ b/src/asn1/asn1c/Time.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/GeneralizedTime.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Time_PR {
        Time_PR_NOTHING,        /* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Time;
 extern asn_CHOICE_specifics_t asn_SPC_Time_specs_1;
 extern asn_TYPE_member_t asn_MBR_Time_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _Time_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/UTCTime.h b/src/asn1/asn1c/UTCTime.h
index 183abaa704b70b03ac896853a5ecf7994dae1555..2b035282b68e112ea6aa1c65ad557348f7428122 100644 (file)
--- a/src/asn1/asn1c/UTCTime.h
+++ b/src/asn1/asn1c/UTCTime.h
@@ -9,10 +9,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t UTCTime_t;  /* Implemented via OCTET STRING */
 
 extern asn_TYPE_descriptor_t asn_DEF_UTCTime;
@@ -40,8 +36,4 @@ time_t asn_UT2time(const UTCTime_t *, struct tm *_optional_tm4fill);
 /* See asn_time2GT() in GeneralizedTime.h */
 UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm *);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _UTCTime_H_ */

diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h
index d278658d6dbb1cdd0336901c532f16772ee74d18..6bbc80445c1383e68a9197468fa3418b0e3821ae 100644 (file)
--- a/src/asn1/asn1c/UnsignedAttributes.h
+++ b/src/asn1/asn1c/UnsignedAttributes.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CMSAttribute;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_UnsignedAttributes;
 extern asn_SET_OF_specifics_t asn_SPC_UnsignedAttributes_specs_1;
 extern asn_TYPE_member_t asn_MBR_UnsignedAttributes_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CMSAttribute.h"
 

diff --git a/src/asn1/asn1c/Version.h b/src/asn1/asn1c/Version.h
index 8621749f9fb6f2e51eed1ef799979078b182c073..574113e361cfbe20cec7a11b6b399106815126c7 100644 (file)
--- a/src/asn1/asn1c/Version.h
+++ b/src/asn1/asn1c/Version.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Version {
        Version_v1      = 0,
@@ -37,9 +33,5 @@ ber_type_decoder_f Version_decode_ber;
 der_type_encoder_f Version_encode_der;
 xer_type_encoder_f Version_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _Version_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/asn_SEQUENCE_OF.h b/src/asn1/asn1c/asn_SEQUENCE_OF.h
index 7b0e4d9e77fe4af30b0fcf0b3a0023f4d3126a4b..6c5a11f84d517a3182c2c5afa00c8e453686bb03 100644 (file)
--- a/src/asn1/asn1c/asn_SEQUENCE_OF.h
+++ b/src/asn1/asn1c/asn_SEQUENCE_OF.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * SEQUENCE OF is the same as SET OF with a tiny difference:
  * the delete operation preserves the initial order of elements
@@ -45,8 +41,4 @@ typedef A_SEQUENCE_OF(void) asn_anonymous_sequence_;
 #define _A_SEQUENCE_FROM_VOID(ptr)     ((asn_anonymous_sequence_ *)(ptr))
 #define _A_CSEQUENCE_FROM_VOID(ptr)    ((const asn_anonymous_sequence_ *)(ptr))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_SEQUENCE_OF_H */

diff --git a/src/asn1/asn1c/asn_SET_OF.h b/src/asn1/asn1c/asn_SET_OF.h
index b51ad586bb35c0dc7f65b047d95edf360ef1b639..16b052ec75c03c085f780bbb096d1e1991f6547f 100644 (file)
--- a/src/asn1/asn1c/asn_SET_OF.h
+++ b/src/asn1/asn1c/asn_SET_OF.h
@@ -6,15 +6,6 @@
 #define        ASN_SET_OF_H
 #include <stdlib.h>
 
-#ifdef __cplusplus
-#define A_SET_OF(type)                   \
-    struct {                             \
-        type **array;                    \
-        int count; /* Meaningful size */ \
-        int size;  /* Allocated size */  \
-        void (*free)(decltype(*array));  \
-    }
-#else   /* C */
 #define A_SET_OF(type)                   \
     struct {                             \
         type **array;                    \
@@ -22,11 +13,6 @@
         int size;  /* Allocated size */  \
         void (*free)(type *);    \
     }
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #define        ASN_SET_ADD(headptr, ptr)               \
        asn_set_add((headptr), (ptr))
@@ -66,8 +52,4 @@ typedef A_SET_OF(void) asn_anonymous_set_;
 #define _A_SET_FROM_VOID(ptr)          ((asn_anonymous_set_ *)(ptr))
 #define _A_CSET_FROM_VOID(ptr)         ((const asn_anonymous_set_ *)(ptr))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_SET_OF_H */

diff --git a/src/asn1/asn1c/asn_application.h b/src/asn1/asn1c/asn_application.h
index ed74febe3fbda6147a377fd17b2637d65c2aa88c..94c3407a536d55f5e3bcbdb7574bcca37a807573 100644 (file)
--- a/src/asn1/asn1c/asn_application.h
+++ b/src/asn1/asn1c/asn_application.h
@@ -11,10 +11,6 @@
 #include "asn1/asn1c/asn_system.h"     /* for platform-dependent types */
 #include "asn1/asn1c/asn_codecs.h"     /* for ASN.1 codecs specifics */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A selection of ASN.1 Transfer Syntaxes to use with generalized
  * encoders and decoders declared further in this .h file.
@@ -137,11 +133,6 @@ typedef void (asn_app_constraint_failed_f)(void *application_specific_key,
        const void *structure_which_failed_ptr,
        const char *error_message_format, ...) CC_PRINTFLIKE(4, 5);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #include "asn1/asn1c/constr_TYPE.h"    /* for asn_TYPE_descriptor_t */
 
 #endif /* ASN_APPLICATION_H */

diff --git a/src/asn1/asn1c/asn_codecs.h b/src/asn1/asn1c/asn_codecs.h
index 36a2d7228d9f4444fecd02e85f585ae3e7dbec11..b7f25d1e7e3b8c5a21f637a384e6a4033e03d951 100644 (file)
--- a/src/asn1/asn1c/asn_codecs.h
+++ b/src/asn1/asn1c/asn_codecs.h
@@ -13,10 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;  /* Forward declaration */
 
 /*
@@ -109,8 +105,4 @@ typedef struct asn_dec_rval_s {
        return tmp_error;                                       \
 } while(0)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_CODECS_H */

diff --git a/src/asn1/asn1c/asn_codecs_prim.h b/src/asn1/asn1c/asn_codecs_prim.h
index 93c20d656aa4e63ff435a5e5fe897ba1efff4ba2..30675ca9837109af389647859358340afecea099 100644 (file)
--- a/src/asn1/asn1c/asn_codecs_prim.h
+++ b/src/asn1/asn1c/asn_codecs_prim.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ASN__PRIMITIVE_TYPE_s {
     uint8_t *buf;   /* Buffer with consecutive primitive encoding bytes */
     size_t size;    /* Size of the buffer */
@@ -20,8 +16,4 @@ asn_struct_free_f ASN__PRIMITIVE_TYPE_free;
 ber_type_decoder_f ber_decode_primitive;
 der_type_encoder_f der_encode_primitive;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_CODECS_PRIM_H */

diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h
index 198d7238e018f1cfd05b8dc3be6debbf4fb135d9..4d74313e1cd05dec27391619239f12be847cee08 100644 (file)
--- a/src/asn1/asn1c/asn_internal.h
+++ b/src/asn1/asn1c/asn_internal.h
@@ -12,10 +12,6 @@
 #endif
 #include "asn1/asn1c/asn_application.h"        /* Application-visible API */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Environment version might be used to avoid running with the old library */
 #define        ASN1C_ENVIRONMENT_VERSION       923     /* Compile-time version */
 int get_asn1c_environment_version(void);       /* Run-time version */
@@ -141,8 +137,4 @@ ASN__STACK_OVERFLOW_CHECK(const asn_codec_ctx_t *ctx) {
        return 0;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_INTERNAL_H */

diff --git a/src/asn1/asn1c/asn_ioc.h b/src/asn1/asn1c/asn_ioc.h
index e04dba436511acae71d4c24547540a553a98d2ef..06c2a35e6266d2ea856bf4e3beba66396ae3aa61 100644 (file)
--- a/src/asn1/asn1c/asn_ioc.h
+++ b/src/asn1/asn1c/asn_ioc.h
@@ -8,10 +8,6 @@
 
 #include "asn1/asn1c/asn_system.h"             /* Platform-specific types */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;
 struct asn_ioc_cell_s;
 
@@ -42,9 +38,4 @@ typedef struct asn_ioc_cell_s {
     } open_type;
 } asn_ioc_cell_t;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN_IOC_H */

diff --git a/src/asn1/asn1c/ber_decoder.h b/src/asn1/asn1c/ber_decoder.h
index 68455dee45ea5969bdb16ddc5d3d636e6ad243a9..64e2be57bf85703f78a798c36263f01edac1b763 100644 (file)
--- a/src/asn1/asn1c/ber_decoder.h
+++ b/src/asn1/asn1c/ber_decoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;  /* Forward declaration */
 struct asn_codec_ctx_s;                /* Forward declaration */
 
@@ -59,8 +55,4 @@ asn_dec_rval_t ber_check_tags(
     ber_tlv_len_t *last_length, int *opt_tlv_form /* optional tag form */
 );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BER_DECODER_H_ */

diff --git a/src/asn1/asn1c/ber_tlv_length.h b/src/asn1/asn1c/ber_tlv_length.h
index c8d2b4be43717503f78a47fa08d631768b7b6352..8a5e68c73ba3062cfd1d6056613fccd2777f4ac0 100644 (file)
--- a/src/asn1/asn1c/ber_tlv_length.h
+++ b/src/asn1/asn1c/ber_tlv_length.h
@@ -13,10 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef ssize_t ber_tlv_len_t;
 
 /*
@@ -51,8 +47,4 @@ ssize_t ber_skip_length(
  */
 size_t der_tlv_length_serialize(ber_tlv_len_t len, void *bufptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BER_TLV_LENGTH_H_ */

diff --git a/src/asn1/asn1c/ber_tlv_tag.h b/src/asn1/asn1c/ber_tlv_tag.h
index 89084cf25bffe60ac1868f6394a799ce780ca072..a5d44e93c819dfa5123e1db255aa602916264fc9 100644 (file)
--- a/src/asn1/asn1c/ber_tlv_tag.h
+++ b/src/asn1/asn1c/ber_tlv_tag.h
@@ -15,10 +15,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum asn_tag_class {
        ASN_TAG_CLASS_UNIVERSAL         = 0,    /* 0b00 */
        ASN_TAG_CLASS_APPLICATION       = 1,    /* 0b01 */
@@ -63,8 +59,4 @@ ssize_t ber_fetch_tag(const void *bufptr, size_t size, ber_tlv_tag_t *tag_r);
  */
 size_t ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BER_TLV_TAG_H_ */

diff --git a/src/asn1/asn1c/constr_CHOICE.h b/src/asn1/asn1c/constr_CHOICE.h
index 50f12067af9443c7c8bd35ad72071fef117d9597..a9490d938aa2c6a4252ae49a4fcf420a48834765 100644 (file)
--- a/src/asn1/asn1c/constr_CHOICE.h
+++ b/src/asn1/asn1c/constr_CHOICE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_CHOICE_specifics_s {
        /*
         * Target structure description.
@@ -62,8 +58,4 @@ unsigned CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td,
 int CHOICE_variant_set_presence(const asn_TYPE_descriptor_t *td,
                                 void *structure_ptr, unsigned present);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CONSTR_CHOICE_H_ */

diff --git a/src/asn1/asn1c/constr_SEQUENCE.h b/src/asn1/asn1c/constr_SEQUENCE.h
index c2ea6a9a92569d07caca1709eca9ed5e186312fe..52e6c071ecacb400552fc30259adb2c110f5e942 100644 (file)
--- a/src/asn1/asn1c/constr_SEQUENCE.h
+++ b/src/asn1/asn1c/constr_SEQUENCE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_SEQUENCE_specifics_s {
        /*
         * Target structure description.
@@ -46,8 +42,4 @@ xer_type_encoder_f SEQUENCE_encode_xer;
 asn_random_fill_f  SEQUENCE_random_fill;
 extern asn_TYPE_operation_t asn_OP_SEQUENCE;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CONSTR_SEQUENCE_H_ */

diff --git a/src/asn1/asn1c/constr_SEQUENCE_OF.h b/src/asn1/asn1c/constr_SEQUENCE_OF.h
index a347449d70d29fdbe3c59a6e7c0fdbef990d436a..cc288f296a220e63e32d0be2add8eba71ae87784 100644 (file)
--- a/src/asn1/asn1c/constr_SEQUENCE_OF.h
+++ b/src/asn1/asn1c/constr_SEQUENCE_OF.h
@@ -8,10 +8,6 @@
 #include "asn1/asn1c/asn_application.h"
 #include "asn1/asn1c/constr_SET_OF.h"          /* Implemented using SET OF */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A set specialized functions dealing with the SEQUENCE OF type.
  * Generally implemented using SET OF.
@@ -27,8 +23,4 @@ extern asn_TYPE_operation_t asn_OP_SEQUENCE_OF;
 #define        SEQUENCE_OF_decode_ber  SET_OF_decode_ber
 #define        SEQUENCE_OF_random_fill SET_OF_random_fill
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CONSTR_SET_OF_H_ */

diff --git a/src/asn1/asn1c/constr_SET_OF.h b/src/asn1/asn1c/constr_SET_OF.h
index 2a1b305cfca3371371fc109c37bb581dfd8ed3f1..785b2c0c2bfab14b009424b8e8d6a61f50127838 100644 (file)
--- a/src/asn1/asn1c/constr_SET_OF.h
+++ b/src/asn1/asn1c/constr_SET_OF.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_SET_OF_specifics_s {
     /*
      * Target structure description.
@@ -35,8 +31,4 @@ xer_type_encoder_f SET_OF_encode_xer;
 asn_random_fill_f  SET_OF_random_fill;
 extern asn_TYPE_operation_t asn_OP_SET_OF;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CONSTR_SET_OF_H */

diff --git a/src/asn1/asn1c/constr_TYPE.h b/src/asn1/asn1c/constr_TYPE.h
index 92d62d32530c705f4f2e2917bc24e4f0f2f7bb6a..26b3fa59a06eac16d223c82a8bdd5e886c6b8d7c 100644 (file)
--- a/src/asn1/asn1c/constr_TYPE.h
+++ b/src/asn1/asn1c/constr_TYPE.h
@@ -14,10 +14,6 @@
 #include "asn1/asn1c/ber_tlv_length.h"
 #include "asn1/asn1c/ber_tlv_tag.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;  /* Forward declaration */
 struct asn_TYPE_member_s;      /* Forward declaration */
 
@@ -233,8 +229,4 @@ int asn_fprint(FILE *stream, /* Destination stream descriptor */
                const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */
                const void *struct_ptr);         /* Structure to be printed */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _CONSTR_TYPE_H_ */

diff --git a/src/asn1/asn1c/constraints.h b/src/asn1/asn1c/constraints.h
index 32cb129455ad46def5bb8363a2da686729c100cb..16150e07fa9d788444315a9c0a44c0aedbcd4716 100644 (file)
--- a/src/asn1/asn1c/constraints.h
+++ b/src/asn1/asn1c/constraints.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_system.h"             /* Platform-dependent types */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;          /* Forward declaration */
 
 /*
@@ -55,8 +51,4 @@ asn_constr_check_f asn_generic_unknown_constraint; /* Not fully supported */
  */
 #define        ASN__CTFAIL     if(ctfailcb) ctfailcb
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ASN1_CONSTRAINTS_VALIDATOR_H */

diff --git a/src/asn1/asn1c/der_encoder.h b/src/asn1/asn1c/der_encoder.h
index 5a87dd27f4b3460e88ce6b478caf5db8f2c6315e..37005550cbb594da7ec8c707261e38c9d740c02a 100644 (file)
--- a/src/asn1/asn1c/der_encoder.h
+++ b/src/asn1/asn1c/der_encoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;  /* Forward declaration */
 
 /*
@@ -61,8 +57,4 @@ ssize_t der_write_tags(const struct asn_TYPE_descriptor_s *type_descriptor,
                        asn_app_consume_bytes_f *consume_bytes_cb,
                        void *app_key);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _DER_ENCODER_H_ */

diff --git a/src/asn1/asn1c/xer_encoder.h b/src/asn1/asn1c/xer_encoder.h
index fd516c0f46a1eb847d7cf4f3d8bad88adedd0d7e..95a4cf7831ddeb854c7b246af914364f19cdb84d 100644 (file)
--- a/src/asn1/asn1c/xer_encoder.h
+++ b/src/asn1/asn1c/xer_encoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;  /* Forward declaration */
 
 /* Flags used by the xer_encode() and (*xer_type_encoder_f), defined below */
@@ -54,8 +50,4 @@ typedef asn_enc_rval_t(xer_type_encoder_f)(
     void *app_key                              /* Arbitrary callback argument */
 );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _XER_ENCODER_H_ */

diff --git a/src/data_structure/uthash.h b/src/data_structure/uthash.h
index b6564586b3d063f7f74acf73dd21d0d81b40ba7f..0013ed37304dcee950221b61d7d6638d55e1c116 100644 (file)
--- a/src/data_structure/uthash.h
+++ b/src/data_structure/uthash.h
@@ -38,23 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/types.h>
 #include <unistd.h>
 
-/* These macros use decltype or the earlier __typeof GNU extension.
-   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
-   when compiling c++ source) this code uses whatever method is needed
-   or, for VS2008 where neither is available, uses casting workarounds. */
 #if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
-#if defined(_MSC_VER)   /* MS compiler */
-#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
-#define DECLTYPE(x) (decltype(x))
-#else                   /* VS2008 or older (or VS2010 in C mode) */
-#define NO_DECLTYPE
-#endif
-#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__)
-#define NO_DECLTYPE
-#else                   /* GNU, Sun and other compilers */
 #define DECLTYPE(x) (__typeof(x))
 #endif
-#endif
 
 #ifdef NO_DECLTYPE
 #define DECLTYPE(x)