diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/internal/conf.h | 9 | ||||
-rw-r--r-- | include/internal/constant_time_locl.h | 8 | ||||
-rw-r--r-- | include/internal/cryptlib.h | 8 | ||||
-rw-r--r-- | include/internal/dso.h | 7 | ||||
-rw-r--r-- | include/internal/dsoerr.h | 3 | ||||
-rw-r--r-- | include/internal/o_dir.h | 8 |
6 files changed, 0 insertions, 43 deletions
diff --git a/include/internal/conf.h b/include/internal/conf.h index ada3f92b4d..23a9c3b474 100644 --- a/include/internal/conf.h +++ b/include/internal/conf.h @@ -12,11 +12,6 @@ #include <openssl/conf.h> -#ifdef __cplusplus -extern "C" { -#endif - - struct ossl_init_settings_st { char *appname; }; @@ -25,8 +20,4 @@ void openssl_config_int(const char *appname); void openssl_no_config_int(void); void conf_modules_free_int(void); -#ifdef __cplusplus -} -#endif - #endif diff --git a/include/internal/constant_time_locl.h b/include/internal/constant_time_locl.h index d23f515c4f..82ff74652e 100644 --- a/include/internal/constant_time_locl.h +++ b/include/internal/constant_time_locl.h @@ -14,10 +14,6 @@ # include <string.h> # include <openssl/e_os2.h> /* For 'ossl_inline' */ -#ifdef __cplusplus -extern "C" { -#endif - /*- * The boolean methods return a bitmask of all ones (0xff...f) for true * and 0 for false. This is useful for choosing a value based on the result @@ -328,8 +324,4 @@ static ossl_inline void constant_time_lookup(void *out, } } -#ifdef __cplusplus -} -#endif - #endif /* HEADER_CONSTANT_TIME_LOCL_H */ diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 8a96de9847..2808fe7eea 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -25,10 +25,6 @@ # include <openssl/err.h> # include "internal/nelem.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifdef NDEBUG # define ossl_assert(x) ((x) != 0) #else @@ -96,8 +92,4 @@ void *openssl_fopen(const char *filename, const char *mode); uint32_t OPENSSL_rdtsc(void); -#ifdef __cplusplus -} -#endif - #endif diff --git a/include/internal/dso.h b/include/internal/dso.h index 402a76f6df..3e67d5053a 100644 --- a/include/internal/dso.h +++ b/include/internal/dso.h @@ -13,10 +13,6 @@ # include <openssl/crypto.h> # include "internal/dsoerr.h" -#ifdef __cplusplus -extern "C" { -#endif - /* These values are used as commands to DSO_ctrl() */ # define DSO_CTRL_GET_FLAGS 1 # define DSO_CTRL_SET_FLAGS 2 @@ -166,7 +162,4 @@ void *DSO_global_lookup(const char *name); int ERR_load_DSO_strings(void); -# ifdef __cplusplus -} -# endif #endif diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h index a54a18545e..ac6bdcd038 100644 --- a/include/internal/dsoerr.h +++ b/include/internal/dsoerr.h @@ -15,9 +15,6 @@ # ifndef OPENSSL_NO_DSO -# ifdef __cplusplus -extern "C" -# endif int ERR_load_DSO_strings(void); /* diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h index f18fc6708e..f8926877d8 100644 --- a/include/internal/o_dir.h +++ b/include/internal/o_dir.h @@ -39,10 +39,6 @@ #ifndef O_DIR_H # define O_DIR_H -#ifdef __cplusplus -extern "C" { -#endif - typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX; /* @@ -53,8 +49,4 @@ const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory); /* returns 1 on success, 0 on error */ int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx); -#ifdef __cplusplus -} -#endif - #endif /* LPDIR_H */ |