From cbc217134b6b2c08e786bc139ac8374ddb0ffe7c Mon Sep 17 00:00:00 2001
From: Maya Rashish <maya@netbsd.org>
Date: Mon, 3 Jun 2019 16:52:54 -0700
Subject: [PATCH] Bug 1180498 - Tolerate a different major libGL.so on NetBSD
 as well r=jgilbert

---
 gfx/gl/GLContextProviderGLX.cpp | 2 +-
 toolkit/xre/glxtest.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp
index edf1282bece6..13310113ce57 100644
--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -80,7 +80,7 @@ bool GLXLibrary::EnsureInitialized() {
     // which trigger glibc bug
     // http://sourceware.org/bugzilla/show_bug.cgi?id=12225
     const char* libGLfilename = "libGL.so.1";
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__)
     libGLfilename = "libGL.so";
 #endif
 
diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
index b349f0614e60..4bd6fc2df1f7 100644
--- a/toolkit/xre/glxtest.cpp
+++ b/toolkit/xre/glxtest.cpp
@@ -201,7 +201,7 @@ void glxtest() {
         "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
 
     ///// Open libGL and load needed symbols /////
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__)
 #  define LIBGL_FILENAME "libGL.so"
 #else
 #  define LIBGL_FILENAME "libGL.so.1"