Merge remote-tracking branch 'origin/pr/29'

* origin/pr/29: windows: support builder v2 Fix for Windows compilers
QubesOS · Mar 8, 2025 · a59f5d3 · a59f5d3
2 parents 27260de + 283e47e
commit a59f5d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.qubesbuilder b/.qubesbuilder
@@ -12,3 +12,9 @@ vm:
   archlinux:
     build:
     - archlinux
+  windows:
+    build:
+    - dummy
+    inc:
+    - include/qubes-gui-protocol.h
+    - include/qubes-xorg-tray-defs.h
diff --git a/include/qubes-gui-protocol.h b/include/qubes-gui-protocol.h
@@ -59,13 +59,12 @@
  *  - configurable maximum clipboard size per VM and/or GUIVM.
  */
 
-
-#ifdef WINNT
-typedef unsigned __int32 uint32_t;
+#ifdef _WIN32
+// TODO: fix properly for Windows
+#define __attribute__(x)
 #endif
-#ifndef WINNT
+
 #include <stdint.h>
-#endif
 /* version of protocol described in this file, used as gui-daemon protocol
  * version; specific agent defines own version which them support */
 #define QUBES_GUID_PROTOCOL_VERSION_MAJOR 1