Mesa (master): gallium: Don' t try to auto-detect the OS when embedded os is already pre-defined.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Feb 4 14:40:16 UTC 2010


Module: Mesa
Branch: master
Commit: 47a080df15f5df1cfe72b83ccc1629d993b2a3c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47a080df15f5df1cfe72b83ccc1629d993b2a3c0

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb  4 14:37:30 2010 +0000

gallium: Don't try to auto-detect the OS when embedded os is already pre-defined.

---

 src/gallium/include/pipe/p_config.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
index 064605a..c5928dd 100644
--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -115,8 +115,10 @@
 #endif
 
 
+#if !defined(PIPE_OS_EMBEDDED)
+
 /*
- * Operating system family.
+ * Auto-detect the operating system family.
  * 
  * See subsystem below for a more fine-grained distinction.
  */
@@ -164,7 +166,7 @@
 #endif
 
 /*
- * Subsystem.
+ * Try to auto-detect the subsystem.
  * 
  * NOTE: There is no way to auto-detect most of these.
  */
@@ -191,5 +193,7 @@
 #endif
 #endif /* PIPE_OS_WINDOWS */
 
+#endif /* !PIPE_OS_EMBEDDED */
+
 
 #endif /* P_CONFIG_H_ */




More information about the mesa-commit mailing list