Moved remaining compatibility helpers into new lib-compat.h

Moved libnvme-specific compatibility types, definitions, and methods into new nvme/lib-compat.h and removed platform/*.h.

Also cleaned up and standardized formatting of compatibility headers.

Author: bgoing-micron-oss

libnvme/src/meson.build

@@ -197,14 +197,3 @@ if want_mi
         install_mode: mode,
     )
 endif
-
-
-# Install platform abstraction headers
-install_headers([
-        'platform/includes.h',
-        'platform/linux.h',
-        'platform/windows.h',
-    ],
-    subdir: 'platform',
-    install_mode: mode,
-)

libnvme/src/platform/windows.h libnvme/src/nvme/lib-compat.hlibnvme/src/platform/windows.h renamed to libnvme/src/nvme/lib-compat.h

@@ -1,34 +1,46 @@
-// SPDX-License-Identifier: LGPL-2.1-or-later
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * This file is part of libnvme.
- * Copyright (c) 2025 Micron Technology, Inc.
+ * Copyright (c) 2026 Micron Technology, Inc.
  *
- * Windows platform-specific definitions and includes.
+ * Cross-platform compatibility definitions, types, and utilities.
+ *
+ * Authors: Broc Going <[email protected]>
+ *          Brandon Busacker <[email protected]>
  */
-
 #pragma once
 
-/* Windows-specific includes */
+#if defined(_WIN32) || defined(_WIN64)
+
 #define WIN32_LEAN_AND_MEAN	/* keeps windows.h from including winsock.*/
 #include <windows.h>
 
 #include <fcntl.h>
 #include <stdio.h>
 
-
-/* Platform compatibility helper types and methods */
-
 typedef HANDLE libnvme_fd_t;
+
 #define TEST_FD INVALID_HANDLE_VALUE
 #define INIT_FD nullptr
 
 /*
  * Set stdout and stderr to binary mode to prevent Windows text-mode
  * translation from converting LF to CRLF and corrupting raw binary output.
- * Called once at startup from main().
+ * Call once at startup.
  */
 static inline void libnvme_init(void)
 {
 	_setmode(_fileno(stdout), O_BINARY);
 	_setmode(_fileno(stderr), O_BINARY);
 }
+
+#else
+
+typedef int libnvme_fd_t;
+#define TEST_FD 0xFD
+#define INIT_FD -1
+
+/* Platform initialization - no-op on Linux */
+static inline void libnvme_init(void) {}
+
+#endif

libnvme/src/nvme/lib.h

@@ -11,12 +11,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <nvme/lib-compat.h>
 #include <nvme/lib-types.h>
 #include <nvme/stdlib.h>
 #include <nvme/unistd.h>
 
-#include <platform/includes.h> /* for libnvme_fd_t */
-
 enum libnvme_log_level {
 	LIBNVME_LOG_ERR	  = 0,
 	LIBNVME_LOG_WARN  = 1,

libnvme/src/nvme/malloc.h

@@ -7,7 +7,7 @@
  * Provides functionality that may be missing on some platforms.
  * Compatibility is not comprehensive. Only functionality required by
  * nvme-cli and libnvme is included.
- * 
+ *
  * Authors: Broc Going <[email protected]>
  *          Brandon Capener <[email protected]>
  */
@@ -23,4 +23,4 @@ static inline size_t malloc_usable_size(void *ptr)
 	return _msize(ptr);
 }
 
-#endif /* _WIN32 */
+#endif

libnvme/src/nvme/private.h

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <platform/includes.h> /* for libnvme_fd_t */
+#include <nvme/lib-compat.h>
 
 #include <ccan/list/list.h>
 

libnvme/src/nvme/signal.h

@@ -7,9 +7,9 @@
  * Provides functionality that may be missing on some platforms.
  * Compatibility is not comprehensive. Only functionality required by
  * nvme-cli and libnvme is included.
- * 
- * Authors: Brandon Busacker <bbusacker@micron.com>
- *          Broc Going <bgoing@micron.com>
+ *
+ * Authors: Broc Going <bgoing@micron.com>
+ *          Brandon Busacker <bbusacker@micron.com>
  */
 #pragma once
 

libnvme/src/nvme/stdio.h

@@ -8,10 +8,9 @@
  * Compatibility is not comprehensive. Only functionality required by
  * nvme-cli and libnvme is included.
  *
- * Authors: Brandon Capener <bcapener@micron.com>
+ * Authors: Broc Going <bgoing@micron.com>
  *          Brandon Busacker <[email protected]>
 */
-
 #pragma once
 
 #include <stdio.h>

libnvme/src/nvme/stdlib.h

@@ -7,11 +7,10 @@
  * Provides functionality that may be missing on some platforms.
  * Compatibility is not comprehensive. Only functionality required by
  * nvme-cli and libnvme is included.
- * 
+ *
  * Authors: Broc Going <[email protected]>
  *          Brandon Capener <[email protected]>
  */
-
 #pragma once
 
 #include <stdlib.h>