127 lines
3.2 KiB
Diff
127 lines
3.2 KiB
Diff
From 9f717b5f23cbf24dc4c58bc688c931af91975e80 Mon Sep 17 00:00:00 2001
|
|
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
|
|
Date: Wed, 1 Jun 2022 14:17:43 +0200
|
|
Subject: util: remove needless c99_compat.h includes
|
|
|
|
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
|
|
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
|
|
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
|
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16812>
|
|
|
|
Downloaded from upstream commit
|
|
https://cgit.freedesktop.org/mesa/mesa/patch/?id=9f717b5f23cbf24dc4c58bc688c931af91975e80
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
src/util/bitscan.h | 2 --
|
|
src/util/compiler.h | 2 --
|
|
src/util/format_srgb.h | 1 -
|
|
src/util/hash_table.h | 1 -
|
|
src/util/list.h | 1 -
|
|
src/util/macros.h | 1 -
|
|
src/util/mesa-sha1.h | 1 -
|
|
src/util/ptralloc.h | 1 -
|
|
8 files changed, 10 deletions(-)
|
|
|
|
diff --git a/src/util/bitscan.h b/src/util/bitscan.h
|
|
index 726d2d2c385..53cbb91e98c 100644
|
|
--- a/src/util/bitscan.h
|
|
+++ b/src/util/bitscan.h
|
|
@@ -42,8 +42,6 @@
|
|
#include <popcntintrin.h>
|
|
#endif
|
|
|
|
-#include "c99_compat.h"
|
|
-
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
diff --git a/src/util/compiler.h b/src/util/compiler.h
|
|
index 83f8e346a08..d184ad455af 100644
|
|
--- a/src/util/compiler.h
|
|
+++ b/src/util/compiler.h
|
|
@@ -38,8 +38,6 @@
|
|
|
|
#include "util/macros.h"
|
|
|
|
-#include "c99_compat.h" /* inline, __func__, etc. */
|
|
-
|
|
|
|
/**
|
|
* Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN, and CPU_TO_LE32.
|
|
diff --git a/src/util/format_srgb.h b/src/util/format_srgb.h
|
|
index 596af56f4cd..5861b238270 100644
|
|
--- a/src/util/format_srgb.h
|
|
+++ b/src/util/format_srgb.h
|
|
@@ -39,7 +39,6 @@
|
|
|
|
#include <stdint.h>
|
|
#include <math.h>
|
|
-#include "c99_compat.h"
|
|
|
|
extern const float
|
|
util_format_srgb_8unorm_to_linear_float_table[256];
|
|
diff --git a/src/util/hash_table.h b/src/util/hash_table.h
|
|
index c8a96b79edf..002d6c58873 100644
|
|
--- a/src/util/hash_table.h
|
|
+++ b/src/util/hash_table.h
|
|
@@ -31,7 +31,6 @@
|
|
#include <stdlib.h>
|
|
#include <inttypes.h>
|
|
#include <stdbool.h>
|
|
-#include "c99_compat.h"
|
|
#include "macros.h"
|
|
|
|
#ifdef __cplusplus
|
|
diff --git a/src/util/list.h b/src/util/list.h
|
|
index 5ef49e4e955..edc596f3d2d 100644
|
|
--- a/src/util/list.h
|
|
+++ b/src/util/list.h
|
|
@@ -41,7 +41,6 @@
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <assert.h>
|
|
-#include "c99_compat.h"
|
|
|
|
#ifdef DEBUG
|
|
# define list_assert(cond, msg) assert(cond && msg)
|
|
diff --git a/src/util/macros.h b/src/util/macros.h
|
|
index 2138f5d662d..a5dc4846211 100644
|
|
--- a/src/util/macros.h
|
|
+++ b/src/util/macros.h
|
|
@@ -27,7 +27,6 @@
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
|
|
-#include "c99_compat.h"
|
|
#include "c11_compat.h"
|
|
|
|
#include <stdint.h>
|
|
diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h
|
|
index 9d174fd9b99..809fabc525f 100644
|
|
--- a/src/util/mesa-sha1.h
|
|
+++ b/src/util/mesa-sha1.h
|
|
@@ -26,7 +26,6 @@
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <stdbool.h>
|
|
-#include "c99_compat.h"
|
|
#include "sha1/sha1.h"
|
|
|
|
#ifdef __cplusplus
|
|
diff --git a/src/util/ptralloc.h b/src/util/ptralloc.h
|
|
index f74d8c3645d..ca6ded82a2d 100644
|
|
--- a/src/util/ptralloc.h
|
|
+++ b/src/util/ptralloc.h
|
|
@@ -29,7 +29,6 @@
|
|
#include <stdlib.h>
|
|
#include <inttypes.h>
|
|
#include <stdbool.h>
|
|
-#include "c99_compat.h"
|
|
#include "macros.h"
|
|
|
|
#ifdef __cplusplus
|
|
--
|
|
cgit v1.2.1
|
|
|