diff options
Diffstat (limited to 'newlib/libc')
| -rw-r--r-- | newlib/libc/posix/telldir.c | 16 | ||||
| -rw-r--r-- | newlib/libc/stdlib/quick_exit.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c index caac4890b..d4cf4a8c1 100644 --- a/newlib/libc/posix/telldir.c +++ b/newlib/libc/posix/telldir.c @@ -71,7 +71,7 @@ static long dd_loccnt = 1; /* Index of entry for sequential readdir's */ static struct ddloc *dd_hash[NDIRHASH]; /* Hash list heads for ddlocs */ #ifdef HAVE_DD_LOCK -__LOCK_INIT(static, dd_hash_lock); +__LOCK_INIT(static, __dd_hash_lock); #endif /* @@ -92,7 +92,7 @@ _DEFUN(telldir, (dirp), #ifdef HAVE_DD_LOCK __lock_acquire_recursive(dirp->dd_lock); - __lock_acquire(dd_hash_lock); + __lock_acquire(__dd_hash_lock); #endif index = dd_loccnt++; lp->loc_index = index; @@ -102,7 +102,7 @@ _DEFUN(telldir, (dirp), lp->loc_next = dd_hash[LOCHASH(index)]; dd_hash[LOCHASH(index)] = lp; #ifdef HAVE_DD_LOCK - __lock_release(dd_hash_lock); + __lock_release(__dd_hash_lock); __lock_release_recursive(dirp->dd_lock); #endif return (index); @@ -124,7 +124,7 @@ _DEFUN(_seekdir, (dirp, loc), struct dirent *dp; #ifdef HAVE_DD_LOCK - __lock_acquire(dd_hash_lock); + __lock_acquire(__dd_hash_lock); #endif if (loc != 0) { prevlp = &dd_hash[LOCHASH(loc)]; @@ -137,7 +137,7 @@ _DEFUN(_seekdir, (dirp, loc), } if (lp == NULL) { #ifdef HAVE_DD_LOCK - __lock_release(dd_hash_lock); + __lock_release(__dd_hash_lock); #endif return; } @@ -163,7 +163,7 @@ found: dirp->dd_loc = 0; } #ifdef HAVE_DD_LOCK - __lock_release(dd_hash_lock); + __lock_release(__dd_hash_lock); #endif } @@ -175,7 +175,7 @@ _DEFUN(_cleanupdir, (dirp), int i; #ifdef HAVE_DD_LOCK - __lock_acquire(dd_hash_lock); + __lock_acquire(__dd_hash_lock); #endif for (i = 0; i < NDIRHASH; ++i) { struct ddloc head; @@ -200,7 +200,7 @@ _DEFUN(_cleanupdir, (dirp), dd_hash[i] = head.loc_next; } #ifdef HAVE_DD_LOCK - __lock_release(dd_hash_lock); + __lock_release(__dd_hash_lock); #endif } diff --git a/newlib/libc/stdlib/quick_exit.c b/newlib/libc/stdlib/quick_exit.c index 1d6fb231e..34f41b737 100644 --- a/newlib/libc/stdlib/quick_exit.c +++ b/newlib/libc/stdlib/quick_exit.c @@ -44,7 +44,7 @@ struct quick_exit_handler { /** * Lock protecting the handlers list. */ -__LOCK_INIT(static, atexit_mutex); +__LOCK_INIT(static, __atexit_mutex); /** * Stack of cleanup handlers. These will be invoked in reverse order when */ @@ -60,10 +60,10 @@ at_quick_exit(void (*func)(void)) if (NULL == h) return (1); h->cleanup = func; - __lock_acquire(atexit_mutex); + __lock_acquire(__atexit_mutex); h->next = handlers; handlers = h; - __lock_release(atexit_mutex); + __lock_release(__atexit_mutex); return (0); } |