diff --git a/simulate/glfw_dispatch.cc b/simulate/glfw_dispatch.cc index 21161163..bbbd15df 100644 --- a/simulate/glfw_dispatch.cc +++ b/simulate/glfw_dispatch.cc @@ -60,7 +60,7 @@ const struct Glfw& Glfw(void* dlhandle) { glfw.func = reinterpret_cast(dlsym(dlhandle, #func)) #endif #else - #define mjGLFW_RESOLVE_SYMBOL(func) glfw.func = &func + #define mjGLFW_RESOLVE_SYMBOL(func) glfw.func = &::func #endif #define mjGLFW_INITIALIZE_SYMBOL(func) \ diff --git a/simulate/glfw_dispatch.h b/simulate/glfw_dispatch.h index 8052b7df..5dfc1d98 100644 --- a/simulate/glfw_dispatch.h +++ b/simulate/glfw_dispatch.h @@ -22,7 +22,7 @@ namespace mujoco { // This allows us to use GLFW without introducing a link-time dependency on the // library, which is useful e.g. when using GLFW via Python. struct Glfw { -#define mjGLFW_DECLARE_SYMBOL(func) decltype(&func) func +#define mjGLFW_DECLARE_SYMBOL(func) decltype(&::func) func // go/keep-sorted start mjGLFW_DECLARE_SYMBOL(glfwCreateWindow); mjGLFW_DECLARE_SYMBOL(glfwGetCursorPos);