From 8c4e432035a319ad6320ce7b5fdc74adee07884c Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Sun, 26 Nov 2023 23:13:58 +0100 Subject: [PATCH] Fix building with latest libnx commit. --- source/core/usb.c | 6 +++--- source/exception_handler.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/core/usb.c b/source/core/usb.c index b6e4340..cd788a1 100644 --- a/source/core/usb.c +++ b/source/core/usb.c @@ -160,7 +160,7 @@ enum usb_supported_speed { }; /// Imported from libusb, with some adjustments. -struct PACKED usb_bos_descriptor { +struct NX_PACKED usb_bos_descriptor { u8 bLength; u8 bDescriptorType; ///< Must match USB_DT_BOS. u16 wTotalLength; ///< Length of this descriptor and all of its sub descriptors. @@ -170,7 +170,7 @@ struct PACKED usb_bos_descriptor { NXDT_ASSERT(struct usb_bos_descriptor, 0x5); /// Imported from libusb, with some adjustments. -struct PACKED usb_2_0_extension_descriptor { +struct NX_PACKED usb_2_0_extension_descriptor { u8 bLength; u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY. u8 bDevCapabilityType; ///< Must match USB_BT_USB_2_0_EXTENSION. @@ -180,7 +180,7 @@ struct PACKED usb_2_0_extension_descriptor { NXDT_ASSERT(struct usb_2_0_extension_descriptor, 0x7); /// Imported from libusb, with some adjustments. -struct PACKED usb_ss_usb_device_capability_descriptor { +struct NX_PACKED usb_ss_usb_device_capability_descriptor { u8 bLength; u8 bDescriptorType; ///< Must match USB_DT_DEVICE_CAPABILITY. u8 bDevCapabilityType; ///< Must match USB_BT_SS_USB_DEVICE_CAPABILITY. diff --git a/source/exception_handler.cpp b/source/exception_handler.cpp index 00fa423..71f0f5e 100644 --- a/source/exception_handler.cpp +++ b/source/exception_handler.cpp @@ -92,7 +92,7 @@ namespace nxdt::utils { } #endif /* LOG_LEVEL < LOG_LEVEL_NONE */ - static void NORETURN AbortProgramExecution(std::string str) + static void NX_NORETURN AbortProgramExecution(std::string str) { if (g_borealisInitialized) {