From: darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 2 Aug 2011 20:52:36 +0000 (+0000)
Subject: Fix GCC build breaks.
X-Git-Tag: edk2-stable201903~14449
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=eb222aea1d4385fe7e0136686090907686f9cde6

Fix GCC build breaks.
Fix case mismatch for includes of "Socket.h".  Original code was <socket.h> while file was Socket.h in the same directory as the .c file.
Add EFIAPI to function declarations so that they match the definition.
Remove "ineffective" statements from stub functions.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12076 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/StdLib/EfiSocketLib/Init.c b/StdLib/EfiSocketLib/Init.c
index 7a1b89da87..f444acc742 100644
--- a/StdLib/EfiSocketLib/Init.c
+++ b/StdLib/EfiSocketLib/Init.c
@@ -5,14 +5,14 @@
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
+  http://opensource.org/licenses/bsd-license.
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <socket.h>
+#include "Socket.h"
 
 
 /**
diff --git a/StdLib/EfiSocketLib/UseEfiSocketLib.c b/StdLib/EfiSocketLib/UseEfiSocketLib.c
index b0e8ef671a..a07b2b6e22 100644
--- a/StdLib/EfiSocketLib/UseEfiSocketLib.c
+++ b/StdLib/EfiSocketLib/UseEfiSocketLib.c
@@ -12,7 +12,7 @@
 
 **/
 
-#include <socket.h>
+#include "Socket.h"
 
 
 CONST EFI_GUID mEslRawServiceGuid = {
diff --git a/StdLib/Include/Efi/EfiSocketLib.h b/StdLib/Include/Efi/EfiSocketLib.h
index 53ad0d4003..f54d4c8fe3 100644
--- a/StdLib/Include/Efi/EfiSocketLib.h
+++ b/StdLib/Include/Efi/EfiSocketLib.h
@@ -112,13 +112,13 @@ typedef struct _DT_SERVICE DT_SERVICE;  ///<  Forward delcaration
 
 typedef
 EFI_STATUS
-(* PFN_SB_INITIALIZE) (
+(EFIAPI * PFN_SB_INITIALIZE) (
     DT_SERVICE * pService
     );
 
 typedef
 VOID
-(* PFN_SB_SHUTDOWN) (
+(EFIAPI * PFN_SB_SHUTDOWN) (
     DT_SERVICE * pService
     );
 
diff --git a/StdLib/LibC/Uefi/StubFunctions.c b/StdLib/LibC/Uefi/StubFunctions.c
index da2eaf9148..1462c3ff38 100644
--- a/StdLib/LibC/Uefi/StubFunctions.c
+++ b/StdLib/LibC/Uefi/StubFunctions.c
@@ -21,7 +21,6 @@
 struct passwd *
 getpwuid (uid_t uid)
 {
-  uid;
   errno = EPERM;
   return NULL;
 }
@@ -35,7 +34,6 @@ char *getlogin (void)
 struct passwd *
 getpwnam (const char *name)
 {
-  name;
   errno = EPERM;
   return NULL;
 }