aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe/p_config.h
diff options
context:
space:
mode:
authorAlan Coopersmith <[email protected]>2009-03-23 20:17:57 -0700
committerAlan Coopersmith <[email protected]>2009-03-25 11:07:31 -0700
commitad11107206ff4954366d77f334431b637ee256fa (patch)
tree2ee36a6ba1e6c3dc580d8806845cb1cddb90bedd /src/gallium/include/pipe/p_config.h
parent6dd9c221012d5e091b2ede90d9b2a6f0383abd58 (diff)
Add #ifdefs needed to compile Gallium on Solaris with gcc or Sun cc
Signed-off-by: Alan Coopersmith <[email protected]>
Diffstat (limited to 'src/gallium/include/pipe/p_config.h')
-rw-r--r--src/gallium/include/pipe/p_config.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
index 7f7657031d8..63238ea46e9 100644
--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -77,11 +77,11 @@
* Processor architecture
*/
-#if defined(__i386__) /* gcc */ || defined(_M_IX86) /* msvc */ || defined(_X86_) || defined(__386__) || defined(i386)
+#if defined(__i386__) /* gcc */ || defined(_M_IX86) /* msvc */ || defined(_X86_) || defined(__386__) || defined(i386) || defined(__i386) /* Sun cc */
#define PIPE_ARCH_X86
#endif
-#if defined(__x86_64__) /* gcc */ || defined(_M_X64) /* msvc */ || defined(_M_AMD64) /* msvc */
+#if defined(__x86_64__) /* gcc */ || defined(_M_X64) /* msvc */ || defined(_M_AMD64) /* msvc */ || defined(__x86_64) /* Sun cc */
#define PIPE_ARCH_X86_64
#endif
@@ -115,6 +115,10 @@
#define PIPE_OS_BSD
#endif
+#if defined(__sun)
+#define PIPE_OS_SOLARIS
+#endif
+
#if defined(_WIN32) || defined(WIN32)
#define PIPE_OS_WINDOWS
#endif
@@ -126,9 +130,9 @@
* NOTE: There is no way to auto-detect most of these.
*/
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
#define PIPE_SUBSYSTEM_DRI
-#endif /* PIPE_OS_LINUX || PIPE_OS_BSD */
+#endif /* PIPE_OS_LINUX || PIPE_OS_BSD || PIPE_OS_SOLARIS */
#if defined(PIPE_OS_WINDOWS)
#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)