2000-08-23 Werner Almesberger <Werner.Almesberger@epfl.ch>

        * libc/stdlib/envlock.c: changed documented "__env_lock" and
        "__env_unlock" prototype from "void *" or "char *" to
        "struct _reent *" to match real function.  Also added include
        of envlock.h.
        * libc/stdlib/mlock.c: changed documented "__malloc_lock" and
        "__malloc_unlock" prototype from "void *" or "char *" to
        "struct _reent *" to match real function.
        * libc/stdlib/envlock.h: added "__env_lock" and "__env_unlock"
        prototypes (for getenv_r.c and setenv_r.c).

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f2a6693b93106e0d34a9a534da60389c6e6f7572..a9350e8b8fc01615225906c0085dda0bce0bf8e5 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,15 @@
+2000-08-23  Werner Almesberger  <Werner.Almesberger@epfl.ch>
+
+        * libc/stdlib/envlock.c: changed documented "__env_lock" and
+        "__env_unlock" prototype from "void *" or "char *" to
+        "struct _reent *" to match real function.  Also added include
+       of envlock.h.
+        * libc/stdlib/mlock.c: changed documented "__malloc_lock" and
+        "__malloc_unlock" prototype from "void *" or "char *" to
+        "struct _reent *" to match real function.
+        * libc/stdlib/envlock.h: added "__env_lock" and "__env_unlock"
+        prototypes (for getenv_r.c and setenv_r.c).
+
 2000-08-22  Werner Almesberger  <Werner.Almesberger@epfl.ch>
 
        * libc/unix/getut.c (utmpname): added _CONST to reflect common use

diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c
index 85bb868e4c7b83ffad97d91e73a386074ab41647..8e55de288e1d43d39d503e30aa90682a9c3d5b6b 100644 (file)
--- 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 df3a0ba58547583a20a3fc311a93c1696fee69dd..9bb6a813ea5e4b3d9e58a93968b04d59fa65797c 100644 (file)
--- 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 e7f7242cec16c2eed2a8c2acaec9133b2caab0ad..485d0d5c9902ed647e4b26e6d6e20012a934f053 100644 (file)
--- 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