[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesa3d-dev
Subject:    [Mesa3d-dev] [PATCH] Fix syntax screw ups introduced in 016fc30,
From:       Ingmar Vanhassel <ingmar () exherbo ! org>
Date:       2010-03-04 1:41:59
Message-ID: 1267666919-6295-1-git-send-email-ingmar () exherbo ! org
[Download RAW message or body]

From: Bo Ørsted Andresen <zlin@exherbo.org>

---
 src/glx/indirect.h           |    2 +-
 src/glx/indirect_size.c      |    2 +-
 src/glx/indirect_size.h      |    2 +-
 src/mesa/glapi/gen/gl_XML.py |    2 +-
 src/mesa/glapi/glapitemp.h   |    2 +-
 src/mesa/main/compiler.h     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/glx/indirect.h b/src/glx/indirect.h
index 7064bfe..5c56f4f 100644
--- a/src/glx/indirect.h
+++ b/src/glx/indirect.h
@@ -37,7 +37,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && \
defined(__ELF__) +#  if (defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= \
0x590))) && defined(__ELF__)  #    define HIDDEN  \
__attribute__((visibility("hidden")))  #  else
 #    define HIDDEN
diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 5a8f27b..af15a2e 100644
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -41,7 +41,7 @@
 #    define FASTCALL
 #  endif
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && \
defined(__ELF__) +#  if (defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= \
0x590))) && defined(__ELF__)  #    define INTERNAL  \
__attribute__((visibility("internal")))  #  else
 #    define INTERNAL
diff --git a/src/glx/indirect_size.h b/src/glx/indirect_size.h
index 43f504a..a6445af 100644
--- a/src/glx/indirect_size.h
+++ b/src/glx/indirect_size.h
@@ -48,7 +48,7 @@
 #    define FASTCALL
 #  endif
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && \
defined(__ELF__) +#  if (defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= \
0x590))) && defined(__ELF__)  #    define INTERNAL  \
__attribute__((visibility("internal")))  #  else
 #    define INTERNAL
diff --git a/src/mesa/glapi/gen/gl_XML.py b/src/mesa/glapi/gen/gl_XML.py
index b769ee2..15db87b 100644
--- a/src/mesa/glapi/gen/gl_XML.py
+++ b/src/mesa/glapi/gen/gl_XML.py
@@ -224,7 +224,7 @@ class gl_print_base:
 		"""
 
 		self.undef_list.append(S)
-		print """#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= \
0x590))) && defined(__ELF__) +		print """#  if (defined(__GNUC__) || \
(defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)  #    define %s  \
__attribute__((visibility("%s")))  #  else
 #    define %s
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index f9b803e..92023c3 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -27,7 +27,7 @@
  */
 
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && \
defined(__ELF__) +#  if (defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= \
0x590))) && defined(__ELF__)  #    define HIDDEN  \
__attribute__((visibility("hidden")))  #  else
 #    define HIDDEN
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 05e69e5..81704ae 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -173,7 +173,7 @@ extern "C" {
  * We also need to define a USED attribute, so the optimizer doesn't 
  * inline a static function that we later use in an alias. - ajax
  */
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #  define PUBLIC __attribute__((visibility("default")))
 #  define USED __attribute__((used))
 #else
-- 
1.7.0.1

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev


[prev in list] [next in list] [prev in thread] [next in thread]