ifdef out some code to make glapi.c linkable in libglx.so (on the
server). This isn't strictly needed yet, but it doesn't hurt anything
either. However, the patches for fd.o bug #2996 require this to build.
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index c11760c..39eb9b9 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -343,7 +343,7 @@
}
-#if !defined( USE_X86_ASM )
+#if !defined( USE_X86_ASM ) && !defined( XFree86Server )
#define NEED_FUNCTION_POINTER
#endif
@@ -388,6 +388,7 @@
}
+#if !defined( XFree86Server )
#ifdef USE_X86_ASM
#if defined( GLX_USE_TLS )
@@ -437,6 +438,7 @@
}
#endif /* USE_X86_ASM */
+#endif /* !defined( XFree86Server ) */
/**
@@ -890,12 +892,14 @@
}
}
+#if !defined( XFree86Server )
/* search static functions */
{
const _glapi_proc func = get_static_proc_address(funcName);
if (func)
return func;
}
+#endif /* !defined( XFree86Server ) */
entry = add_function_name(funcName);
return (entry == NULL) ? NULL : entry->dispatch_stub;