3 files changed, 14 insertions, 8 deletions
diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c
index 85bb868e4..8e55de288 100644
--- a/newlib/libc/stdlib/envlock.c
+++ b/newlib/libc/stdlib/envlock.c
@@ -9,15 +9,15 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include "envlock.h"
-	void __env_lock (void *<[reent]>);
-	void __env_unlock (void *<[reent]>);
+       void __env_lock (struct _reent *<[reent]>);
+       void __env_unlock (struct _reent *<[reent]>);
 
 TRAD_SYNOPSIS
 	void __env_lock(<[reent]>)
-	char *<[reent]>;
+       struct _reent *<[reent]>;
 
 	void __env_unlock(<[reent]>)
-	char *<[reent]>;
+       struct _reent *<[reent]>;
 
 DESCRIPTION
 The <<setenv>> family of routines call these functions when they need
@@ -35,6 +35,9 @@ routines must be careful to avoid causing a thread to wait for a lock
 that it already holds.
 */
 
+#include "envlock.h"
+
+
 void
 __env_lock (ptr)
      struct _reent *ptr;
diff --git a/newlib/libc/stdlib/envlock.h b/newlib/libc/stdlib/envlock.h
index df3a0ba58..9bb6a813e 100644
--- a/newlib/libc/stdlib/envlock.h
+++ b/newlib/libc/stdlib/envlock.h
@@ -9,4 +9,7 @@
 #define ENV_LOCK __env_lock(reent_ptr)
 #define ENV_UNLOCK __env_unlock(reent_ptr)
 
+void _EXFUN(__env_lock,(struct _reent *reent));
+void _EXFUN(__env_unlock,(struct _reent *reent));
+
 #endif /* _INCLUDE_ENVLOCK_H_ */
diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c
index e7f7242ce..485d0d5c9 100644
--- a/newlib/libc/stdlib/mlock.c
+++ b/newlib/libc/stdlib/mlock.c
@@ -9,15 +9,15 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <malloc.h>
-	void __malloc_lock (void *<[reent]>);
-	void __malloc_unlock (void *<[reent]>);
+	void __malloc_lock (struct _reent *<[reent]>);
+	void __malloc_unlock (struct _reent *<[reent]>);
 
 TRAD_SYNOPSIS
 	void __malloc_lock(<[reent]>)
-	char *<[reent]>;
+	struct _reent *<[reent]>;
 
 	void __malloc_unlock(<[reent]>)
-	char *<[reent]>;
+	struct _reent *<[reent]>;
 
 DESCRIPTION
 The <<malloc>> family of routines call these functions when they need