REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2126

Avoid errors of type:

~/edk2/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c:74:1:
error: conflicting types for ‘HttpENTSTestMain’
   74 | HttpENTSTestMain (
      | ^~~~~~~~~~~~~~~~
In file included from <command-line>:
~/edk2/Build/UefiSct/RELEASE_GCC5/X64/SctPkg/TestCase/RIVL/Protocol/
Http/Http/HttpENTSTest/DEBUG/AutoGen.h:77:1:
note: previous declaration of ‘HttpENTSTestMain’ was here
   77 | HttpENTSTestMain (
      | ^~~~~~~~~~~~~~~~

Signed-off-by: Heinrich Schuchardt <xypron.g...@gmx.de>
---
This is only a partial fix to the problem reported in #2126.
---
 uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c  | 1 +
 .../Http/HttpServiceBinding/HttpServiceBindingENTSTest.c         | 1 +
 .../Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c   | 1 +
 uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.c  | 1 +
 .../Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c         | 1 +
 uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.c  | 1 +
 .../Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c         | 1 +
 7 files changed, 7 insertions(+)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
index 0e65fc0e..f380df70 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.c
@@ -71,6 +71,7 @@ HttpENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 HttpENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.c
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.c
index 5a538ca7..0b2f0b15 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.c
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.c
@@ -52,6 +52,7 @@ HttpServiceBindingENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 HttpServiceBindingENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
index b87a43ef..07a1ca0d 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.c
@@ -53,6 +53,7 @@ Mtftp6ServiceBindingENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 Mtftp6ServiceBindingENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.c 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.c
index 261e9adb..e8d472c2 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.c
@@ -91,6 +91,7 @@ Tcp4ENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 Tcp4ENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
index 15e6b1cc..b887ee64 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.c
@@ -52,6 +52,7 @@ Tcp4ServiceBindingENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 Tcp4ServiceBindingENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.c 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.c
index 3d4d5a35..f643136d 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.c
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.c
@@ -87,6 +87,7 @@ Tcp6ENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 Tcp6ENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
index e35f6fc1..6c49bd1d 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.c
@@ -53,6 +53,7 @@ Tcp6ServiceBindingENTSTestUnload (
 

 

 EFI_STATUS

+EFIAPI

 Tcp6ServiceBindingENTSTestMain (

   IN EFI_HANDLE                ImageHandle,

   IN EFI_SYSTEM_TABLE          *SystemTable

-- 
2.23.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47992): https://edk2.groups.io/g/devel/message/47992
Mute This Topic: https://groups.io/mt/34280546/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to