From 26657c395dd532ba9876e2e933167a4fa2d58406 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 14 Apr 2019 15:48:07 -0400
Subject: [PATCH] nvme: Fix the build with GCC2.

---
 .../drivers/disk/nvme/libnvme/nvme_common.h   |  8 ++++++++
 .../kernel/drivers/disk/nvme/nvme_disk.cpp    | 20 +++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_common.h b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_common.h
index 64c1ab7fa6..d039dfa821 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_common.h
+++ b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_common.h
@@ -68,14 +68,22 @@
  * Check if a branch is likely to be taken.
  */
 #ifndef likely
+#if __GNUC__ < 3
+#define likely(x) x
+#else
 #define likely(x)  __builtin_expect((x),1)
+#endif
 #endif /* likely */
 
 /*
  * Check if a branch is unlikely to be taken.
  */
 #ifndef unlikely
+#if __GNUC__ < 3
+#define unlikely(x) x
+#else
 #define unlikely(x)  __builtin_expect((x),0)
+#endif
 #endif /* unlikely */
 
 #ifndef typeof
diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
index a55535ed3a..2c72d113a0 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
@@ -162,19 +162,17 @@ nvme_disk_init_device(void* _info, void** _cookie)
 
 	// construct the libnvme pci_device struct
 	pci_device* device = new pci_device;
-	*device = {
-		.vendor_id = info->info.vendor_id,
-		.device_id = info->info.device_id,
-		.subvendor_id = 0,
-		.subdevice_id = 0,
+	device->vendor_id = info->info.vendor_id;
+	device->device_id = info->info.device_id;
+	device->subvendor_id = 0;
+	device->subdevice_id = 0;
 
-		.domain = 0,
-		.bus = info->info.bus,
-		.dev = info->info.device,
-		.func = info->info.function,
+	device->domain = 0;
+	device->bus = info->info.bus;
+	device->dev = info->info.device;
+	device->func = info->info.function;
 
-		.pci_info = &info->info,
-	};
+	device->pci_info = &info->info;
 
 	// open the controller
 	info->ctrlr = nvme_ctrlr_open(device, NULL);