From 9d9493153c54ae28ae15d3b6732e907986781f87 Mon Sep 17 00:00:00 2001
From: Saran Tunyasuvunakool <stunya@google.com>
Date: Fri, 26 Aug 2022 00:13:13 -0700
Subject: [PATCH] Fix GCC "declaration of ... changes meaning" errors.

PiperOrigin-RevId: 470175500
Change-Id: If13a81f308f803d3cc4731b3d4d0561cfe56d5c8
---
 simulate/glfw_dispatch.cc | 2 +-
 simulate/glfw_dispatch.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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<decltype(glfw.func)>(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);