mirror of
https://github.com/openssl/openssl.git
synced 2025-03-07 19:38:33 +08:00
25f2138b0a
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
32 lines
1.3 KiB
C
32 lines
1.3 KiB
C
{- join("\n",map { "/* $_ */" } @autowarntext) -}
|
|
/*
|
|
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#ifndef HEADER_DSO_CONF_H
|
|
# define HEADER_DSO_CONF_H
|
|
{- # The DSO code currently always implements all functions so that no
|
|
# applications will have to worry about that from a compilation point
|
|
# of view. However, the "method"s may return zero unless that platform
|
|
# has support compiled in for them. Currently each method is enabled
|
|
# by a define "DSO_<name>" ... we translate the "dso_scheme" config
|
|
# string entry into using the following logic;
|
|
my $scheme = $disabled{dso} ? undef : uc $target{dso_scheme};
|
|
if (!$scheme) {
|
|
$scheme = "NONE";
|
|
}
|
|
my @macros = ( "DSO_$scheme" );
|
|
if ($scheme eq 'DLFCN') {
|
|
@macros = ( "DSO_DLFCN", "HAVE_DLFCN_H" );
|
|
} elsif ($scheme eq "DLFCN_NO_H") {
|
|
@macros = ( "DSO_DLFCN" );
|
|
}
|
|
join("\n", map { "# define $_" } @macros); -}
|
|
# define DSO_EXTENSION "{- platform->dsoext() -}"
|
|
#endif
|