Renamed globals xlib_* to g_xlib_*.

client/deps/glbench/src/egl_stuff.cc

Index: client/deps/glbench/src/egl_stuff.cc
diff --git a/client/deps/glbench/src/egl_stuff.cc b/client/deps/glbench/src/egl_stuff.cc
index 088df2a250377a1247c51bb46872760237454c8c..0887cc0aad2837da84b85f9f5d768ba9dcb974c3 100644
--- a/client/deps/glbench/src/egl_stuff.cc
+++ b/client/deps/glbench/src/egl_stuff.cc
@@ -22,7 +22,7 @@ bool Init() {
     return false;
 
   EGLNativeWindowType native_window =
-      static_cast<EGLNativeWindowType>(xlib_window);
+      static_cast<EGLNativeWindowType>(g_xlib_window);
   egl_surface = eglCreateWindowSurface(egl_display, egl_config,
                                        native_window, NULL);
   CHECK_EGL();
@@ -41,7 +41,7 @@ VisualID GetVisualID() {
   };
 
   EGLNativeDisplayType native_display =
-      static_cast<EGLNativeDisplayType>(xlib_display);
+      static_cast<EGLNativeDisplayType>(g_xlib_display);
 
   EGLDisplay egl_display = eglGetDisplay(native_display);
   CHECK_EGL();