diff options
author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
---|---|---|
committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
commit | 0f68236a2487dbeb0396b996debcda595b0b54a1 (patch) | |
tree | 938ae3b779349b6dba6f5a891550604f9a9ca895 /src/mapi/glapi/glapi_getproc.c | |
parent | d047168d81cfeb39a98f3ae16416872facc6237c (diff) | |
parent | 237880463d5168cad8df0bae6018b5fd76617777 (diff) |
Merge remote branch 'origin/master' into nvc0-new
Diffstat (limited to 'src/mapi/glapi/glapi_getproc.c')
-rw-r--r-- | src/mapi/glapi/glapi_getproc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mapi/glapi/glapi_getproc.c b/src/mapi/glapi/glapi_getproc.c index 47a01176d5..0a6ff7795f 100644 --- a/src/mapi/glapi/glapi_getproc.c +++ b/src/mapi/glapi/glapi_getproc.c @@ -42,7 +42,7 @@ */ -#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) +#if !defined(DISPATCH_FUNCTION_SIZE) # define NEED_FUNCTION_POINTER #endif #include "glapi/glprocs.h" @@ -88,7 +88,6 @@ get_static_proc_offset(const char *funcName) } -#if !defined(XFree86Server) /** * Return dispatch function address for the named static (built-in) function. @@ -113,16 +112,6 @@ get_static_proc_address(const char *funcName) #endif } -#else - -static _glapi_proc -get_static_proc_address(const char *funcName) -{ - (void) funcName; - return NULL; -} - -#endif /* !defined(XFree86Server) */ /** |