From 0a8e6909175c136a1c83c012b4f5851570ddd035 Mon Sep 17 00:00:00 2001
From: Brad Chase <bchase@ripple.com>
Date: Mon, 21 Nov 2016 11:34:46 -0500
Subject: [PATCH] Remove duplicate translation unit names

---
 Builds/VisualStudio2015/RippleD.vcxproj         | 2 +-
 Builds/VisualStudio2015/RippleD.vcxproj.filters | 2 +-
 CMakeLists.txt                                  | 2 +-
 SConstruct                                      | 2 +-
 src/ripple/unity/{ed25519.c => ed25519_donna.c} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/ripple/unity/{ed25519.c => ed25519_donna.c} (100%)

diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index 187968521..d9edda3aa 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -3370,7 +3370,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\unity\ed25519.c">
+    <ClCompile Include="..\..\src\ripple\unity\ed25519_donna.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\ed25519-donna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\ed25519-donna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\ed25519-donna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index c5e936c3b..30189bf05 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -3993,7 +3993,7 @@
     <ClCompile Include="..\..\src\ripple\unity\crypto.cpp">
       <Filter>ripple\unity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\unity\ed25519.c">
+    <ClCompile Include="..\..\src\ripple\unity\ed25519_donna.c">
       <Filter>ripple\unity</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\json.cpp">
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8ba49a10..9e0492a4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,7 +382,7 @@ endif()
 add_with_props(rippled_src_all src/sqlite/sqlite_unity.c
   ${extra_props})
 
-add_with_props(rippled_src_all src/ripple/unity/ed25519.c
+add_with_props(rippled_src_all src/ripple/unity/ed25519_donna.c
   -I"${CMAKE_SOURCE_DIR}/"src/ed25519-donna)
 
 if (is_gcc)
diff --git a/SConstruct b/SConstruct
index 704d60845..3f0f81d88 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1178,7 +1178,7 @@ for tu_style in ['classic', 'unity']:
                 cc_flags = {}
 
             object_builder.add_source_files(
-                'src/ripple/unity/ed25519.c',
+                'src/ripple/unity/ed25519_donna.c',
                 CPPPATH=[
                     'src/ed25519-donna',
                 ]
diff --git a/src/ripple/unity/ed25519.c b/src/ripple/unity/ed25519_donna.c
similarity index 100%
rename from src/ripple/unity/ed25519.c
rename to src/ripple/unity/ed25519_donna.c