Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/C/GenFw/GenFw.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• BaseTools/Source/C/GenFw/GenFw.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/C/GenFw/GenFw.c

@@ -8 +8 @@
 
 #ifndef __GNUC__
+<<<<<<< .working
 # ifdef VBOX
 // RUNTIME_FUNCTION typedef conflicts; just use EFI headers
 # else
+||||||| .merge-left.r168232
+=======
+#define RUNTIME_FUNCTION  _WINNT_DUP_RUNTIME_FUNCTION
+>>>>>>> .merge-right.r168232
 #include <windows.h>
+<<<<<<< .working
 #endif
+||||||| .merge-left.r168232
+=======
+#undef RUNTIME_FUNCTION
+>>>>>>> .merge-right.r168232
 #include <io.h>
 #include <sys/types.h>