summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.h2
-rw-r--r--malloc/mtrace.c2
-rw-r--r--malloc/obstack.h6
-rw-r--r--malloc/thread-m.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 53b9d1b206..a72102e607 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -199,4 +199,4 @@ extern void __malloc_check_init __MALLOC_P ((void));
 }; /* end of extern "C" */
 #endif
 
-#endif /* !defined(_MALLOC_H) */
+#endif /* malloc.h */
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 35380a09a1..3f0cbb9726 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -25,7 +25,7 @@
 #define	_MALLOC_INTERNAL
 #include <malloc.h>
 #include <mcheck.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
 #endif
 
 #include <stdio.h>
diff --git a/malloc/obstack.h b/malloc/obstack.h
index b60828b6ae..ad6b830fcb 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -104,8 +104,8 @@ Summary:
 
 /* Don't do the contents of this file more than once.  */
 
-#ifndef __OBSTACK_H__
-#define __OBSTACK_H__
+#ifndef _OBSTACK_H
+#define _OBSTACK_H 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -587,4 +587,4 @@ __extension__								\
 }	/* C++ */
 #endif
 
-#endif /* not __OBSTACK_H__ */
+#endif /* obstack.h */
diff --git a/malloc/thread-m.h b/malloc/thread-m.h
index 8307f256ff..9afd058ccb 100644
--- a/malloc/thread-m.h
+++ b/malloc/thread-m.h
@@ -28,7 +28,7 @@
 
 #if defined(_LIBC) /* The GNU C library, a special case of Posix threads */
 
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
 
 #ifdef PTHREAD_MUTEX_INITIALIZER