diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-07-03 14:14:50 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-07-03 14:14:50 +0200 |
| commit | 3db7a35080d2836476a38d85391e1fcb7e7feb86 (patch) | |
| tree | 4e8ec24ef287895d59a5e8ab5a98d28fbe724b88 | |
| parent | 10d4063181dfceba2a1f0799c98ddeecf4495d82 (diff) | |
| parent | c28bfd7e33e5e08a01737ff2ff82f1e6e1e0e484 (diff) | |
| download | otp-3db7a35080d2836476a38d85391e1fcb7e7feb86.tar.gz otp-3db7a35080d2836476a38d85391e1fcb7e7feb86.tar.bz2 otp-3db7a35080d2836476a38d85391e1fcb7e7feb86.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/.gitignore | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 01541aff72..bf48c832b3 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -1900,7 +1900,7 @@ case "$THR_LIB_NAME" in #define _DARWIN_C_SOURCE #include <pthread.h>], [char buff[256]; pthread_getname_np(pthread_self(), buff, 256);], - pthread_getname=normal) + pthread_getname=linux) AC_TRY_LINK([#define __USE_GNU #define _DARWIN_C_SOURCE #include <pthread.h>], diff --git a/lib/.gitignore b/lib/.gitignore index 58c49adce0..b1da61706d 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -133,10 +133,12 @@ # mnesia +/mnesia/doc/src/Mnesia_App_A.xml /mnesia/doc/src/Mnesia_App_B.xml /mnesia/doc/src/Mnesia_App_C.xml /mnesia/doc/src/Mnesia_App_D.xml /mnesia/doc/src/Mnesia_chap2.xml +/mnesia/doc/src/Mnesia_chap3.xml /mnesia/doc/src/Mnesia_chap4.xml /mnesia/doc/src/Mnesia_chap5.xml /mnesia/doc/src/Mnesia_chap7.xml |