diff --git a/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp b/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
index eb62bc9cf15..f99c90f0287 100644
--- a/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
+++ b/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
@@ -43,7 +43,7 @@ DrmVirtGpuResource::DrmVirtGpuResource(int64_t deviceHandle, uint32_t blobHandle
 }
 
 DrmVirtGpuResource::~DrmVirtGpuResource() {
-    if (mBlobHandle == INVALID_DESCRIPTOR) {
+    if (mBlobHandle == static_cast<uint32_t>(INVALID_DESCRIPTOR)) {
         return;
     }
 
diff --git a/src/gfxstream/guest/platform/include/VirtGpu.h b/src/gfxstream/guest/platform/include/VirtGpu.h
index 528665e0ac1..aea25346db7 100644
--- a/src/gfxstream/guest/platform/include/VirtGpu.h
+++ b/src/gfxstream/guest/platform/include/VirtGpu.h
@@ -129,7 +129,7 @@ struct VirtGpuPciBusInfo {
     uint8_t function;
 };
 
-#define INVALID_DESCRIPTOR 0xFFFFFFFFU
+constexpr int32_t INVALID_DESCRIPTOR = 0xFFFFFFFF;
 
 class VirtGpuResourceMapping;
 class VirtGpuResource;