luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from bsilver8192/fix-macro-redefinition

Browse Source 
Fix redefinition of _XOPEN_SOURCE.
This commit is contained in:
Fumitoshi Ukai 2015-08-06 17:15:44 +09:00
commit 254db0ae1b
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -9,6 +9,7 @@
# Please keep the list sorted. # Please keep the list sorted.
Abhishek Parmar <abhishek@orng.net> Abhishek Parmar <abhishek@orng.net>
Brian Silverman <bsilver16384@gmail.com>
Google Inc. Google Inc.
Michael Tanner <michael@tannertaxpro.com> Michael Tanner <michael@tannertaxpro.com>
romange <romange@users.noreply.github.com> romange <romange@users.noreply.github.com>

1
CONTRIBUTORS
View File

@ -23,6 +23,7 @@
# Please keep the list sorted. # Please keep the list sorted.
Abhishek Parmar <abhishek@orng.net> Abhishek Parmar <abhishek@orng.net>
Brian Silverman <bsilver16384@gmail.com>
Fumitoshi Ukai <ukai@google.com> Fumitoshi Ukai <ukai@google.com>
Håkan L. S. Younes <hyounes@google.com> Håkan L. S. Younes <hyounes@google.com>
Ivan Penkov <ivanpe@google.com> Ivan Penkov <ivanpe@google.com>

4
src/base/mutex.h
View File

@ -134,7 +134,9 @@
// *does* cause problems for FreeBSD, or MacOSX, but isn't needed // *does* cause problems for FreeBSD, or MacOSX, but isn't needed
// for locking there.) // for locking there.)
# ifdef __linux__ # 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 # endif
# include <pthread.h> # include <pthread.h>
typedef pthread_rwlock_t MutexType; typedef pthread_rwlock_t MutexType;