From 1be0dda62d546b09d6892e09c48910ace6d57f01 Mon Sep 17 00:00:00 2001 From: jljusten Date: Tue, 8 Apr 2008 20:59:38 +0000 Subject: Fix warnings generated by gcc for ia32 builds: 'cast from pointer to integer of different size' when casting from a pointer directly to a 64 bit number. Added an intermediate cast to UINTN. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5009 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Core/Dxe/Image/Image.c | 2 +- EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'EdkModulePkg') diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c index daf5fd180b..341df42614 100644 --- a/EdkModulePkg/Core/Dxe/Image/Image.c +++ b/EdkModulePkg/Core/Dxe/Image/Image.c @@ -790,7 +790,7 @@ Returns: FilePath, SourceBuffer, SourceSize, - (EFI_PHYSICAL_ADDRESS)NULL, + (EFI_PHYSICAL_ADDRESS) (UINTN) NULL, NULL, ImageHandle, NULL, diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c index 30ee71f763..30b9fdccf5 100644 --- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c +++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c @@ -467,7 +467,7 @@ ConSplitterTextOutConstructor ( ConOutPrivate->GraphicsOutput.Mode->Info->Version = 0; ConOutPrivate->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly; ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION); - ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL; + ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL; ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0; ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1; @@ -1985,7 +1985,7 @@ Returns: CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly; ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK)); CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION); - CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL; + CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL; CurrentGraphicsOutputMode->FrameBufferSize = 0; } @@ -2021,7 +2021,7 @@ Returns: CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly; CurrentGraphicsOutputMode->Info->PixelsPerScanLine = 800; CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION); - CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL; + CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL; CurrentGraphicsOutputMode->FrameBufferSize = 0; // -- cgit v1.2.3