diff options
| author | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-16 23:16:56 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-16 23:16:56 +0000 |
| commit | 76beedc09c9156b0e711e08e8af55dd2084e810a (patch) | |
| tree | 20980222eb683f07f85b0280c81b6c0599966931 /StdLib/LibC | |
| parent | c614ca505dd2947acbd111e2764056aeac2012ad (diff) | |
| download | edk2-76beedc09c9156b0e711e08e8af55dd2084e810a.tar.gz edk2-76beedc09c9156b0e711e08e8af55dd2084e810a.tar.bz2 edk2-76beedc09c9156b0e711e08e8af55dd2084e810a.zip | |
StdLib: Change the last argument of the ioctl helper functions to va_list* from void*.
Functions which call these helper functions always pass the last parameter as a va_list argument.
Add a conditional block around a MSFT-only pragma so that stringlist.c will compile with GCC.
Comment-out the Socket Library components within StdLib.dsc. These components are still in development.
Signed-off-by: darylm503
Reviewed by: geekboy15A
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12369 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'StdLib/LibC')
| -rw-r--r-- | StdLib/LibC/Uefi/Devices/Console/daConsole.c | 3 | ||||
| -rw-r--r-- | StdLib/LibC/Uefi/Devices/UefiShell/daShell.c | 3 | ||||
| -rw-r--r-- | StdLib/LibC/Uefi/Devices/Utility/DevGenisis.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/StdLib/LibC/Uefi/Devices/Console/daConsole.c b/StdLib/LibC/Uefi/Devices/Console/daConsole.c index 5a593557e0..600fb073c4 100644 --- a/StdLib/LibC/Uefi/Devices/Console/daConsole.c +++ b/StdLib/LibC/Uefi/Devices/Console/daConsole.c @@ -26,6 +26,7 @@ #include <errno.h>
#include <wctype.h>
#include <wchar.h>
+#include <stdarg.h>
#include <sys/fcntl.h>
#include <kfile.h>
#include <Device/Device.h>
@@ -377,7 +378,7 @@ EFIAPI da_ConIoctl(
struct __filedes *filp,
ULONGN cmd,
- void *argp
+ va_list argp
)
{
return -EPERM;
diff --git a/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c b/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c index d56db49159..d0abb8dd5b 100644 --- a/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c +++ b/StdLib/LibC/Uefi/Devices/UefiShell/daShell.c @@ -26,6 +26,7 @@ #include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <wctype.h>
#include <wchar.h>
#include <sys/fcntl.h>
@@ -319,7 +320,7 @@ EFIAPI da_ShellIoctl(
struct __filedes *filp,
ULONGN cmd,
- void *argp ///< May be a pointer or a value
+ va_list argp
)
{
return -EPERM;
diff --git a/StdLib/LibC/Uefi/Devices/Utility/DevGenisis.c b/StdLib/LibC/Uefi/Devices/Utility/DevGenisis.c index 6510ce7747..f6d375e6db 100644 --- a/StdLib/LibC/Uefi/Devices/Utility/DevGenisis.c +++ b/StdLib/LibC/Uefi/Devices/Utility/DevGenisis.c @@ -17,6 +17,7 @@ #include <LibConfig.h>
#include <errno.h>
+#include <stdarg.h>
#include <sys/poll.h>
#include <kfile.h>
#include <Device/Device.h>
@@ -45,7 +46,7 @@ int EFIAPI fnullop_flush (struct __filedes *filp) int EFIAPI fbadop_stat (struct __filedes *filp, struct stat *StatBuf, void *Buf)
{ return -EPERM; }
-int EFIAPI fbadop_ioctl (struct __filedes *filp, ULONGN Cmd, void *argp)
+int EFIAPI fbadop_ioctl (struct __filedes *filp, ULONGN Cmd, va_list argp)
{ return -EPERM; }
int EFIAPI fbadop_delete (struct __filedes *filp)
|