From 31c3127a94506700a045d00bfe6333cf1258db07 Mon Sep 17 00:00:00 2001 From: Patrick Steuer Date: Wed, 13 Nov 2019 18:39:51 +0100 Subject: [PATCH] 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 --- test/build.info | 2 +- test/testutil/{init.c => testutil_init.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/testutil/{init.c => testutil_init.c} (100%) 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/testutil_init.c similarity index 100% rename from test/testutil/init.c rename to test/testutil/testutil_init.c -- 2.25.1