Drop glx_ansic.h wrapper and call malloc, realloc, free and str-funcs directly.

 commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Mar 17 01:47:25 2006 +0000

        Check for glproto when building GLX and make sure we have at least 1.4.6.
        Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
            directly.

     We don't check the glproto version as we know what it is (we have our own proto file).

     Furthermore, we skip the switch from --glX<func> -> x<func> and directly switch to
     <func> (e.g. __glXMalloc() -> malloc()).

     Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

2 files changed, 9 insertions, 9 deletions

diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c
index d47f3eaca..6c5cf3daf 100644
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c
+++ b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c
@@ -195,10 +195,10 @@ int _slang_execute (const slang_assembly_file *file)
 	/* XXX why???, disabling the pointer size assertions here.

 	 * See bug 4021.

 	 */

-	static_assert(sizeof (GLfloat) == 4);

-	/*static_assert(sizeof (GLfloat *) == 4);*/

-	static_assert(sizeof (GLuint) == 4);

-	/*static_assert(sizeof (GLuint *) == 4);*/

+	_static_assert(sizeof (GLfloat) == 4);

+	/*_static_assert(sizeof (GLfloat *) == 4);*/

+	_static_assert(sizeof (GLuint) == 4);

+	/*_static_assert(sizeof (GLuint *) == 4);*/

 

 	dump (file);

 

diff --git a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h
index 2b040a444..6f2f5d345 100644
--- a/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h
+++ b/nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h
@@ -29,11 +29,11 @@
 extern "C" {

 #endif

 

-/* Compile-time assertions.  If the expression is zero, try to declare an

- * array of size [-1] to cause compilation error.

- */

-#define static_assert(expr) do { int _array[(expr) ? 1 : -1]; _array[0]; } while (0)

-

+/* Compile-time assertions.  If the expression is zero, try to declare an
+ * array of size [-1] to cause compilation error.
+ */
+#define _static_assert(expr) do { int _array[(expr) ? 1 : -1]; _array[0]; } while (0)
+
 void slang_alloc_free (void *);

 void *slang_alloc_malloc (unsigned int);

 void *slang_alloc_realloc (void *, unsigned int, unsigned int);