fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Merge p_compiler.h into src/util/compiler.h

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23577>
This commit is contained in:
Yonggang Luo 2023-06-12 01:07:29 +08:00
parent b7b4e53404
commit 0d82c0a026
2 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/include/pipe/p_compiler.h
View file

@ -30,41 +30,5 @@
#include "util/compiler.h"
#include "util/detect.h"
#include "util/macros.h"
#include <limits.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(__HAIKU__) && !defined(__USE_MISC)
#if !DETECT_OS_ANDROID
typedef unsigned int uint;
#endif
typedef unsigned short ushort;
#endif
typedef unsigned char ubyte;
typedef unsigned char boolean;
#ifndef TRUE
#define TRUE true
#endif
#ifndef FALSE
#define FALSE false
#endif
#if defined(__cplusplus)
}
#endif
#endif /* P_COMPILER_H */

24
src/util/compiler.h
View file

@ -35,10 +35,16 @@
#include <assert.h>
#include <limits.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "util/detect.h"
#include "util/macros.h"
#include "util/u_endian.h"
#include "util/detect_arch.h"
/**
* Define CPU_TO_LE32
@ -101,4 +107,18 @@
#define FALLTHROUGH do { } while(0)
#endif
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(__HAIKU__) && !defined(__USE_MISC)
#if !DETECT_OS_ANDROID
typedef unsigned int uint;
#endif
#endif
#if defined(__cplusplus)
}
#endif
#endif /* COMPILER_H */