diff options
author | Jesse Natalie <jenatali@microsoft.com> | 2021-09-01 06:57:40 -0700 |
---|---|---|
committer | Jesse Natalie <jenatali@microsoft.com> | 2021-09-08 07:21:26 -0700 |
commit | 92f515ad6ed9f57f83064108e0acb0af36d68d7e (patch) | |
tree | 2ef4d94a43a51854431cdf7acda1d06dd44f81f1 /src/mapi | |
parent | d326d32e24cbcda97c429d935fb869abf972a977 (diff) |
mapi: Fix shared-glapi build with MSVC
Reviewed By: Bill Kristiansen <billkris@microsoft.com>
Reviewed-by: Charmaine Lee >charmainel@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12677>
Diffstat (limited to 'src/mapi')
-rw-r--r-- | src/mapi/mapi_glapi.c | 2 | ||||
-rw-r--r-- | src/mapi/stub.c | 4 | ||||
-rw-r--r-- | src/mapi/u_current.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c index 21ca0a0902d..afc466504bb 100644 --- a/src/mapi/mapi_glapi.c +++ b/src/mapi/mapi_glapi.c @@ -121,7 +121,7 @@ _glapi_add_dispatch( const char * const * function_names, const struct mapi_stub *alias = NULL; unsigned i; - (void) memset(function_stubs, 0, sizeof(function_stubs)); + (void) memset((void*)function_stubs, 0, sizeof(function_stubs)); /* find the missing stubs, and decide the alias */ for (i = 0; function_names[i] != NULL && i < 8; i++) { diff --git a/src/mapi/stub.c b/src/mapi/stub.c index 45e4f7dc69e..2aefdbe8948 100644 --- a/src/mapi/stub.c +++ b/src/mapi/stub.c @@ -65,7 +65,7 @@ stub_compare(const void *key, const void *elem) const struct mapi_stub *stub = (const struct mapi_stub *) elem; const char *stub_name; - stub_name = &public_string_pool[(unsigned long) stub->name]; + stub_name = &public_string_pool[(size_t) stub->name]; return strcmp(name, stub_name); } @@ -193,7 +193,7 @@ stub_get_name(const struct mapi_stub *stub) if (stub >= public_stubs && stub < public_stubs + ARRAY_SIZE(public_stubs)) - name = &public_string_pool[(unsigned long) stub->name]; + name = &public_string_pool[(size_t) stub->name]; else name = (const char *) stub->name; diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h index 52da534797a..a717162a755 100644 --- a/src/mapi/u_current.h +++ b/src/mapi/u_current.h @@ -50,13 +50,13 @@ u_current_destroy(void); void u_current_set_table(const struct _glapi_table *tbl); -struct _glapi_table * +_GLAPI_EXPORT struct _glapi_table * u_current_get_table_internal(void); void u_current_set_context(const void *ptr); -void * +_GLAPI_EXPORT void * u_current_get_context_internal(void); #endif /* _U_CURRENT_H_ */ |