Mesa (master): os: Ensure header includes are outside extern "C" {}.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Feb 4 18:27:57 UTC 2010


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb  4 18:24:57 2010 +0000

os: Ensure header includes are outside extern "C" {}.

---

 src/gallium/auxiliary/os/os_misc.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/os/os_misc.h b/src/gallium/auxiliary/os/os_misc.h
index 56e48ca..d59f981 100644
--- a/src/gallium/auxiliary/os/os_misc.h
+++ b/src/gallium/auxiliary/os/os_misc.h
@@ -38,6 +38,12 @@
 #include "pipe/p_compiler.h"
 
 
+#if defined(PIPE_OS_UNIX)
+#  include <signal.h> /* for kill() */
+#  include <unistd.h> /* getpid() */
+#endif
+
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -51,8 +57,6 @@ extern "C" {
 #elif defined(PIPE_CC_MSVC)
 #  define os_break()  __debugbreak()
 #elif defined(PIPE_OS_UNIX)
-#  include <signal.h> /* for kill() */
-#  include <unistd.h> /* for getpid() */
 #  define os_break() kill(getpid(), SIGTRAP)
 #elif defined(PIPE_OS_EMBEDDED)
 void os_break(void);




More information about the mesa-commit mailing list