From: Patrick Steuer Date: Wed, 13 Nov 2019 17:39:51 +0000 (+0100) Subject: testutil/init.c rename to testutil/testutil_init.c X-Git-Tag: OpenSSL_1_1_1e~142 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31c3127a94506700a045d00bfe6333cf1258db07;p=oweals%2Fopenssl.git testutil/init.c rename to testutil/testutil_init.c Avoid conflicts with some linkers. Signed-off-by: Patrick Steuer Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10439) (cherry picked from commit e74b5dcf16dfd7c91d9f9a7e69c447f00d778e17) Conflicts: test/build.info --- diff --git a/test/build.info b/test/build.info index db28dd97f7..9b57edf518 100644 --- a/test/build.info +++ b/test/build.info @@ -12,7 +12,7 @@ IF[{- !$disabled{tests} -}] SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \ testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \ testutil/format_output.c testutil/tap_bio.c \ - testutil/test_cleanup.c testutil/main.c testutil/init.c \ + testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \ testutil/random.c INCLUDE[libtestutil.a]=../include DEPEND[libtestutil.a]=../libcrypto diff --git a/test/testutil/init.c b/test/testutil/init.c deleted file mode 100644 index 5095c7f7e3..0000000000 --- a/test/testutil/init.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2017 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 - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include "../testutil.h" - -int global_init(void) -{ - return 1; -} diff --git a/test/testutil/testutil_init.c b/test/testutil/testutil_init.c new file mode 100644 index 0000000000..5095c7f7e3 --- /dev/null +++ b/test/testutil/testutil_init.c @@ -0,0 +1,15 @@ +/* + * Copyright 2017 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 + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include "../testutil.h" + +int global_init(void) +{ + return 1; +}