summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2005-10-11 16:56:39 +0000
committerIan Romanick <[email protected]>2005-10-11 16:56:39 +0000
commit44b1bd7597bea6d48d26551c2678de65ed5c3648 (patch)
tree1fa0ec49bd266d7214f6b8f2dae1232baf744474 /src
parente7325294d0d35b34d1869f7c4e97a9be76faf181 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/glapi/glapi.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index c11760cf126..39eb9b91bd8 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -343,7 +343,7 @@ _glapi_get_dispatch(void)
}
-#if !defined( USE_X86_ASM )
+#if !defined( USE_X86_ASM ) && !defined( XFree86Server )
#define NEED_FUNCTION_POINTER
#endif
@@ -388,6 +388,7 @@ get_static_proc_offset(const char *funcName)
}
+#if !defined( XFree86Server )
#ifdef USE_X86_ASM
#if defined( GLX_USE_TLS )
@@ -437,6 +438,7 @@ get_static_proc_address(const char *funcName)
}
#endif /* USE_X86_ASM */
+#endif /* !defined( XFree86Server ) */
/**
@@ -890,12 +892,14 @@ _glapi_get_proc_address(const char *funcName)
}
}
+#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;