aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--erts/aclocal.m42
-rw-r--r--lib/.gitignore2
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