Small simplification in mkerr.pl

As suggested in https://github.com/openssl/openssl/pull/5275

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5288)

diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index a97177e9580ff6e21a882ba8b390ba2f3a34563c..660e193665c1ec0a385413acae2e4f9520bfc15e 100644 (file)
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -18,7 +18,8 @@ static const ERR_STRING_DATA OCSP_str_functs[] = {
     {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_ADD1_STATUS, 0),
      "OCSP_basic_add1_status"},
     {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN, 0), "OCSP_basic_sign"},
-    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN_CTX, 0), "OCSP_basic_sign_ctx"},
+    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN_CTX, 0),
+     "OCSP_basic_sign_ctx"},
     {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_VERIFY, 0), "OCSP_basic_verify"},
     {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_CERT_ID_NEW, 0), "OCSP_cert_id_new"},
     {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_CHECK_DELEGATED, 0),

diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index 7017990083a4a1ff72f1d368e62720dfd45a71b8..a54a18545e3c75bf5bc16bc144dcbe51a1734eb7 100644 (file)
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DSO
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DSO_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * DSO function codes.

diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index c02bb0f322290c1d7da86da91ccf71e36acc8679..7da927f6bfd49e245cda5c6dc7d0675f97fe6012 100644 (file)
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_ASN1ERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_ASN1_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * ASN1 function codes.

diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h
index a9bb86ead9d4f68732da11bc15a488764346d8b1..5fcddaf27a9b638900f82b7853d8264c1da4c339 100644 (file)
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_ASYNCERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_ASYNC_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * ASYNC function codes.

diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index 251023077967eeef8db3893b9be5f96640f65e46..b0dee2bc345ba550ee21504b93614c17f33389ac 100644 (file)
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_BIOERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BIO_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * BIO function codes.

diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index b63af9df42a51f980ad4e5c204a3689ebe06fdfb..c9a21c77a6ff8138a6584cedbae17c504cd0083e 100644 (file)
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_BNERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BN_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * BN function codes.

diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index 9007586d604a5111eaff98bd0446b7d84e61f3a5..3aee1323238363c4ceede5bb1de69e58575010c6 100644 (file)
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_BUFERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BUF_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * BUF function codes.

diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index 7cb224290fb1865a3de738f81ad6bb61fc1078a0..7b9daedb0feb0b4c864c3da02a3913c1b85718dc 100644 (file)
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_CMS
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_CMS_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * CMS function codes.

diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 96a4ce62f5b068a9a5899fd4ea6a106cda73fe9f..5a1c8df97b79de9847cf59a257a76f0e8c0943f9 100644 (file)
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_COMP
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_COMP_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * COMP function codes.

diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index 4348e62871a114bdb3c3a64ff4491c9119c79172..d623cea6d5ae599d04ba1da79ec6c2ac040e3edc 100644 (file)
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_CONFERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_CONF_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * CONF function codes.

diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 98fc2789a4927de772658f2935f625f1e3d31de2..12684eac55b284b4b06c22c869e0e398d1a49b51 100644 (file)
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_CRYPTOERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_CRYPTO_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * CRYPTO function codes.

diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index 7f0a7d8b98543468b98c1a11e50c0a5e279e67dc..764e1a22046240c36273aa2ce0a2f4d59601f1b2 100644 (file)
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_CT
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_CT_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * CT function codes.

diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index f225cc392b5eb4db5d71054d497abc8aa4fb348f..0a071b6f3a12e9548aa973fd636bd215f03cdf89 100644 (file)
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DH
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DH_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * DH function codes.

diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index d54642fdf63fddee91fc4ab3b798269b0113f6da..a5248ab700fbb2330c30666e9ace00888e0d11cf 100644 (file)
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DSA
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DSA_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * DSA function codes.

diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 6dc16c017fd1cdfc9f39a558702ea859b36562df..289cd8c5aeda54c72efd7f99c92072678ec0314f 100644 (file)
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_EC
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_EC_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * EC function codes.

diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index f6025f62f3b24556fa8544dc557a7fd537e5e6af..64efc2fd049e4e8319dfa2a5f88f793c715a23ff 100644 (file)
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_ENGINE
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_ENGINE_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * ENGINE function codes.

diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index ff46657ef0b4fa70a63d0ddb6464a53a627a9262..45e9fcfffbaee0f9a3056f6d9be0022eb95bfc05 100644 (file)
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -12,12 +12,9 @@
 # define HEADER_EVPERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_EVP_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * EVP function codes.

diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h
index 8f045f06ce9ba69b3fedc1b86403e59833a4b1df..ea30fb9c9ff15a6b5244aee252545836cce1fdb3 100644 (file)
--- a/include/openssl/kdferr.h
+++ b/include/openssl/kdferr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_KDFERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_KDF_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * KDF function codes.

diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index a6051c838dd48c36b19470d51c46349084fa1caa..4f3156e94ac6a5880e5d5b353ab614c89bd9f31c 100644 (file)
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_OBJERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_OBJ_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * OBJ function codes.

diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index f78f232bcdc887ae0e4c1cb1b18c79c1a44f274d..7d93b12d497ee0ab8aaee299efe08613444ddff4 100644 (file)
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_OCSP
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_OCSP_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * OCSP function codes.

diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index 12eb5cb34f80eaadbfe69d8f56edd3bbaa75de30..d0b8a9c3cc9f1e56666893d7432a83391fa57fa3 100644 (file)
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_PEMERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PEM_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * PEM function codes.

diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index 6bbd232dccab38b9392f6b536f2ed2c81b0bf94e..ba8204385ac93ca43c2daf774962edec7db4a1b8 100644 (file)
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_PKCS12ERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PKCS12_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * PKCS12 function codes.

diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index 5e5f708e744855f2a95aa1851474f3fa7c727bc1..0ba418d7805d07c20138ed5a1213ee08539835d7 100644 (file)
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_PKCS7ERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PKCS7_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * PKCS7 function codes.

diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index 50c1a38fd4ee084b4986dce2d2e795fa6dbf47e9..ae5a2ea9929f74a344154fd807fbdb90c900a89f 100644 (file)
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@@ -12,12 +12,9 @@
 # define HEADER_RANDERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_RAND_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * RAND function codes.

diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index 94bfd93fc781f7a2c99ba4c9d617f444645bc219..c1b826ae73b07125f34b915fe1132bd6882c2300 100644 (file)
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_RSAERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_RSA_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * RSA function codes.

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index a84a62d30ff25ade13995f126d30f484d39adda8..1a02268846ffc0e22b66609b4c33c3092ad18bbb 100644 (file)
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -12,12 +12,9 @@
 # define HEADER_SSLERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_SSL_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * SSL function codes.

diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index cffe8dea182e44ad9923022938a7afda565e0983..5476d007bddd09e0fec9c9e2ecd47921cd39ef07 100644 (file)
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_OSSL_STOREERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_OSSL_STORE_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * OSSL_STORE function codes.

diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index 01ebfef7d49ebb2e7daf4eaff0506442c490c0e2..3e0492565764e8d187776d1c5747491d73f19c0a 100644 (file)
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_TS
 
 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_TS_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif
 
 /*
  * TS function codes.

diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index f7c77f2ed139540eae6e3744cbb09a7b225f1882..3e4b2979068c144bcb1129061b26ffb18d3f1aff 100644 (file)
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_UIERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_UI_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * UI function codes.

diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 4b57c3df8844d337f88da6ef9f761e86b501f290..08692a5bc9aab30e10b459717e3ba167af06d391 100644 (file)
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_X509ERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_X509_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * X509 function codes.

diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index 5349d9dd6fa56898a57fe23f6972857d44862a66..e8308efc2f1d067bf0332f5bc75dc02957a43ef7 100644 (file)
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,12 +12,9 @@
 # define HEADER_X509V3ERR_H
 
 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_X509V3_strings(void);
-# ifdef  __cplusplus
-}
-# endif
 
 /*
  * X509V3 function codes.

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 1740e40427d4ddc7de0642a8df297907c1cd6cdb..0ea02961a5fdea9bb0427eacd97a4035e97f623a 100755 (executable)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -471,12 +471,9 @@ EOF
         }
         print OUT <<"EOF";
 #${indent}ifdef  __cplusplus
-extern \"C\" {
+extern \"C\"
 #${indent}endif
 int ERR_load_${lib}_strings(void);
-#${indent}ifdef  __cplusplus
-}
-#${indent}endif
 EOF
     } else {
         print OUT <<"EOF";