mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-20 00:48:23 +00:00
50 lines
1.2 KiB
Diff
50 lines
1.2 KiB
Diff
https://github.com/xonotic/darkplaces/commit/0ad63a18c8d59dc27c0729175d6d0fea3cdd4d18
|
|
|
|
From 56ddec2571e27a8f144d14d2243dcc723b2956f6 Mon Sep 17 00:00:00 2001
|
|
From: Root <root@example.com>
|
|
Date: Mon, 28 Jul 2025 10:27:56 +0800
|
|
Subject: [PATCH] fix GCC 15 build
|
|
|
|
---
|
|
source/darkplaces/dpsoftrast.c | 4 ----
|
|
source/darkplaces/qtypes.h | 7 +------
|
|
2 files changed, 1 insertion(+), 10 deletions(-)
|
|
|
|
diff --git a/source/darkplaces/dpsoftrast.c b/source/darkplaces/dpsoftrast.c
|
|
index fff29b8..1eda341 100644
|
|
--- a/source/darkplaces/dpsoftrast.c
|
|
+++ b/source/darkplaces/dpsoftrast.c
|
|
@@ -10,10 +10,6 @@
|
|
#pragma warning(disable : 4324)
|
|
#endif
|
|
|
|
-#ifndef __cplusplus
|
|
-typedef qboolean bool;
|
|
-#endif
|
|
-
|
|
#define ALIGN_SIZE 16
|
|
#define ATOMIC_SIZE 4
|
|
|
|
diff --git a/source/darkplaces/qtypes.h b/source/darkplaces/qtypes.h
|
|
index 6c09614..e6e277b 100644
|
|
--- a/source/darkplaces/qtypes.h
|
|
+++ b/source/darkplaces/qtypes.h
|
|
@@ -2,14 +2,9 @@
|
|
#ifndef QTYPES_H
|
|
#define QTYPES_H
|
|
|
|
-#undef true
|
|
-#undef false
|
|
+#include <stdbool.h>
|
|
|
|
-#ifndef __cplusplus
|
|
-typedef enum qboolean_e {false, true} qboolean;
|
|
-#else
|
|
typedef bool qboolean;
|
|
-#endif
|
|
|
|
#ifndef NULL
|
|
#define NULL ((void *)0)
|
|
--
|
|
2.50.1
|
|
|