From 287ab79862c112ccc197160088cb640295392e35 Mon Sep 17 00:00:00 2001
From: Brian Silverman <bsilver16384@gmail.com>
Date: Tue, 16 Jun 2015 16:49:53 -0700
Subject: [PATCH 1/2] Add Brian Silverman to AUTHORS+CONTRIBUTORS.

---
 AUTHORS      | 1 +
 CONTRIBUTORS | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index b48edf9..c68cc98 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,4 +9,5 @@
 # Please keep the list sorted.
 
 Abhishek Parmar <abhishek@orng.net>
+Brian Silverman <bsilver16384@gmail.com>
 Google Inc.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5efed60..d447e55 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -23,6 +23,7 @@
 # Please keep the list sorted.
 
 Abhishek Parmar <abhishek@orng.net>
+Brian Silverman <bsilver16384@gmail.com>
 Fumitoshi Ukai <ukai@google.com>
 Håkan L. S. Younes <hyounes@google.com>
 Ivan Penkov <ivanpe@google.com>

From beb55fa825acf524fe69dd8624bc4eddda39b7e5 Mon Sep 17 00:00:00 2001
From: Brian Silverman <bsilver16384@gmail.com>
Date: Tue, 16 Jun 2015 16:50:25 -0700
Subject: [PATCH 2/2] Fix redefinition of _XOPEN_SOURCE.

Under Debian Jessie, I get a warning about redefining _XOPEN_SOURCE
which is easy to fix.
---
 src/base/mutex.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/base/mutex.h b/src/base/mutex.h
index 37527d5..ced2b99 100644
--- a/src/base/mutex.h
+++ b/src/base/mutex.h
@@ -134,7 +134,9 @@
   // *does* cause problems for FreeBSD, or MacOSX, but isn't needed
   // for locking there.)
 # ifdef __linux__
-#   define _XOPEN_SOURCE 500  // may be needed to get the rwlock calls
+#   ifndef _XOPEN_SOURCE  // Some other header might have already set it for us.
+#     define _XOPEN_SOURCE 500  // may be needed to get the rwlock calls
+#   endif
 # endif
 # include <pthread.h>
   typedef pthread_rwlock_t MutexType;