From: Ian Romanick <idr@us.ibm.com>
Date: Tue, 11 Oct 2005 16:56:39 +0000 (+0000)
Subject: ifdef out some code to make glapi.c linkable in libglx.so (on the
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44b1bd7597bea6d48d26551c2678de65ed5c3648;p=mesa.git

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 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;