projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
gallium
/
include
/
pipe
/
p_config.h
diff --git
a/src/gallium/include/pipe/p_config.h
b/src/gallium/include/pipe/p_config.h
index de99957d9d0a99ef323ef5947481c1ac7435009a..064605a4a059189973751f9780aefe64575eae0d 100644
(file)
--- a/
src/gallium/include/pipe/p_config.h
+++ b/
src/gallium/include/pipe/p_config.h
@@
-53,6
+53,7
@@
#if defined(__GNUC__)
#define PIPE_CC_GCC
#if defined(__GNUC__)
#define PIPE_CC_GCC
+#define PIPE_CC_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
/*
#endif
/*
@@
-122,18
+123,35
@@
#if defined(__linux__)
#define PIPE_OS_LINUX
#if defined(__linux__)
#define PIPE_OS_LINUX
+#define PIPE_OS_UNIX
#endif
#if defined(__FreeBSD__)
#endif
#if defined(__FreeBSD__)
+#define PIPE_OS_FREEBSD
#define PIPE_OS_BSD
#define PIPE_OS_BSD
+#define PIPE_OS_UNIX
+#endif
+
+#if defined(__OpenBSD__)
+#define PIPE_OS_OPENBSD
+#define PIPE_OS_BSD
+#define PIPE_OS_UNIX
+#endif
+
+#if defined(__NetBSD__)
+#define PIPE_OS_NETBSD
+#define PIPE_OS_BSD
+#define PIPE_OS_UNIX
#endif
#if defined(__sun)
#define PIPE_OS_SOLARIS
#endif
#if defined(__sun)
#define PIPE_OS_SOLARIS
+#define PIPE_OS_UNIX
#endif
#if defined(__APPLE__)
#define PIPE_OS_APPLE
#endif
#if defined(__APPLE__)
#define PIPE_OS_APPLE
+#define PIPE_OS_UNIX
#endif
#if defined(_WIN32) || defined(WIN32)
#endif
#if defined(_WIN32) || defined(WIN32)
@@
-142,6
+160,7
@@
#if defined(__HAIKU__)
#define PIPE_OS_HAIKU
#if defined(__HAIKU__)
#define PIPE_OS_HAIKU
+#define PIPE_OS_UNIX
#endif
/*
#endif
/*