Switch from cthreads to pthreads

Makefiles, headers, types, macros and function calls are renamed where
appropriate.

Most of this work was done by Barry deFreese and Thomas DiModica.

* auth/Makefile: Switch from cthreads to pthreads.
* auth/auth.c: Likewise.
* boot/Makefile: Likewise.
* boot/boot.c: Likewise.
* boot/ux.c: Likewise.
* console-client/Makefile: Likewise.
* console-client/console.c: Likewise.
* console-client/driver.c: Likewise.
* console-client/driver.h: Likewise.
* console-client/generic-speaker.c: Likewise.
* console-client/kbd-repeat.c: Likewise.
* console-client/ncursesw.c: Likewise.
* console-client/pc-kbd.c: Likewise.
* console-client/pc-mouse.c: Likewise.
* console-client/timer.c: Likewise.
* console-client/trans.c: Likewise.
* console-client/vga.c: Likewise.
* console/Makefile: Likewise.
* console/console.c: Likewise.
* console/display.c: Likewise.
* console/input.c: Likewise.
* console/pager.c: Likewise.
* defpager/backing.c: Likewise.
* exec/Makefile: Likewise.
* exec/exec.c: Likewise.
* exec/hashexec.c: Likewise.
* exec/priv.h: Likewise.
* ext2fs/Makefile: Likewise.
* ext2fs/balloc.c: Likewise.
* ext2fs/dir.c: Likewise.
* ext2fs/ext2fs.c: Likewise.
* ext2fs/ext2fs.h: Likewise.
* ext2fs/ialloc.c: Likewise.
* ext2fs/inode.c: Likewise.
* ext2fs/msg.c: Likewise.
* ext2fs/pager.c: Likewise.
* ext2fs/pokel.c: Likewise.
* ext2fs/storeinfo.c: Likewise.
* ext2fs/truncate.c: Likewise.
* fatfs/Makefile: Likewise.
* fatfs/dir.c: Likewise.
* fatfs/fat.c: Likewise.
* fatfs/fatfs.h: Likewise.
* fatfs/inode.c: Likewise.
* fatfs/main.c: Likewise.
* fatfs/pager.c: Likewise.
* fatfs/virt-inode.c: Likewise.
* ftpfs/Makefile: Likewise.
* ftpfs/ccache.c: Likewise.
* ftpfs/ccache.h: Likewise.
* ftpfs/conn.c: Likewise.
* ftpfs/dir.c: Likewise.
* ftpfs/fs.c: Likewise.
* ftpfs/ftpfs.c: Likewise.
* ftpfs/ftpfs.h: Likewise.
* ftpfs/ncache.c: Likewise.
* ftpfs/netfs.c: Likewise.
* ftpfs/node.c: Likewise.
* hostmux/Makefile: Likewise.
* hostmux/hostmux.h: Likewise.
* hostmux/mux.c: Likewise.
* hostmux/node.c: Likewise.
* hostmux/stubs.c: Likewise.
* hurd/shared.h: Likewise.
* isofs/Makefile: Likewise.
* isofs/inode.c: Likewise.
* isofs/lookup.c: Likewise.
* isofs/main.c: Likewise.
* isofs/pager.c: Likewise.
* libcons/Makefile: Likewise.
* libcons/cons-switch.c: Likewise.
* libcons/cons.h: Likewise.
* libcons/dir-changed.c: Likewise.
* libcons/file-changed.c: Likewise.
* libcons/init-init.c: Likewise.
* libcons/vcons-close.c: Likewise.
* libcons/vcons-input.c: Likewise.
* libcons/vcons-move-mouse.c: Likewise.
* libcons/vcons-open.c: Likewise.
* libcons/vcons-scrollback.c: Likewise.
* libdiskfs/Makefile: Likewise.
* libdiskfs/boot-start.c: Likewise.
* libdiskfs/dead-name.c: Likewise.
* libdiskfs/dir-chg.c: Likewise.
* libdiskfs/dir-link.c: Likewise.
* libdiskfs/dir-lookup.c: Likewise.
* libdiskfs/dir-mkdir.c: Likewise.
* libdiskfs/dir-mkfile.c: Likewise.
* libdiskfs/dir-readdir.c: Likewise.
* libdiskfs/dir-rename.c: Likewise.
* libdiskfs/dir-renamed.c: Likewise.
* libdiskfs/dir-rmdir.c: Likewise.
* libdiskfs/dir-unlink.c: Likewise.
* libdiskfs/disk-pager.c: Likewise.
* libdiskfs/diskfs-pager.h: Likewise.
* libdiskfs/diskfs.h: Likewise.
* libdiskfs/file-access.c: Likewise.
* libdiskfs/file-chg.c: Likewise.
* libdiskfs/file-exec.c: Likewise.
* libdiskfs/file-get-fs-opts.c: Likewise.
* libdiskfs/file-get-trans.c: Likewise.
* libdiskfs/file-get-transcntl.c: Likewise.
* libdiskfs/file-getcontrol.c: Likewise.
* libdiskfs/file-getfh.c: Likewise.
* libdiskfs/file-lock-stat.c: Likewise.
* libdiskfs/file-lock.c: Likewise.
* libdiskfs/file-reparent.c: Likewise.
* libdiskfs/file-set-trans.c: Likewise.
* libdiskfs/file-sync.c: Likewise.
* libdiskfs/file-syncfs.c: Likewise.
* libdiskfs/fsys-getroot.c: Likewise.
* libdiskfs/fsys-options.c: Likewise.
* libdiskfs/fsys-syncfs.c: Likewise.
* libdiskfs/ifsock.c: Likewise.
* libdiskfs/init-first.c: Likewise.
* libdiskfs/init-init.c: Likewise.
* libdiskfs/init-startup.c: Likewise.
* libdiskfs/io-duplicate.c: Likewise.
* libdiskfs/io-get-conch.c: Likewise.
* libdiskfs/io-identity.c: Likewise.
* libdiskfs/io-map-cntl.c: Likewise.
* libdiskfs/io-map.c: Likewise.
* libdiskfs/io-modes-get.c: Likewise.
* libdiskfs/io-modes-off.c: Likewise.
* libdiskfs/io-modes-on.c: Likewise.
* libdiskfs/io-modes-set.c: Likewise.
* libdiskfs/io-owner-get.c: Likewise.
* libdiskfs/io-owner-mod.c: Likewise.
* libdiskfs/io-prenotify.c: Likewise.
* libdiskfs/io-read.c: Likewise.
* libdiskfs/io-readable.c: Likewise.
* libdiskfs/io-reauthenticate.c: Likewise.
* libdiskfs/io-rel-conch.c: Likewise.
* libdiskfs/io-restrict-auth.c: Likewise.
* libdiskfs/io-revoke.c: Likewise.
* libdiskfs/io-seek.c: Likewise.
* libdiskfs/io-sigio.c: Likewise.
* libdiskfs/io-stat.c: Likewise.
* libdiskfs/io-write.c: Likewise.
* libdiskfs/lookup.c: Likewise.
* libdiskfs/name-cache.c: Likewise.
* libdiskfs/node-drop.c: Likewise.
* libdiskfs/node-make.c: Likewise.
* libdiskfs/node-nput.c: Likewise.
* libdiskfs/node-nputl.c: Likewise.
* libdiskfs/node-nref.c: Likewise.
* libdiskfs/node-nrefl.c: Likewise.
* libdiskfs/node-nrele.c: Likewise.
* libdiskfs/node-nrelel.c: Likewise.
* libdiskfs/peropen-rele.c: Likewise.
* libdiskfs/priv.h: Likewise.
* libdiskfs/shutdown.c: Likewise.
* libdiskfs/sync-interval.c: Likewise.
* libfshelp/Makefile: Likewise.
* libfshelp/fetch-root.c: Likewise.
* libfshelp/fshelp.h: Likewise.
* libfshelp/get-identity.c: Likewise.
* libfshelp/lock-acquire.c: Likewise.
* libfshelp/lock-init.c: Likewise.
* libfshelp/locks.h: Likewise.
* libfshelp/set-active.c: Likewise.
* libfshelp/trans.h: Likewise.
* libfshelp/transbox-init.c: Likewise.
* libiohelp/Makefile: Likewise.
* libiohelp/get_conch.c: Likewise.
* libiohelp/handle_io_release_conch.c: Likewise.
* libiohelp/initialize_conch.c: Likewise.
* libiohelp/iohelp.h: Likewise.
* libiohelp/verify_user_conch.c: Likewise.
* libnetfs/Makefile: Likewise.
* libnetfs/dir-lookup.c: Likewise.
* libnetfs/dir-mkdir.c: Likewise.
* libnetfs/dir-mkfile.c: Likewise.
* libnetfs/dir-readdir.c: Likewise.
* libnetfs/dir-rmdir.c: Likewise.
* libnetfs/dir-unlink.c: Likewise.
* libnetfs/drop-node.c: Likewise.
* libnetfs/file-chauthor.c: Likewise.
* libnetfs/file-check-access.c: Likewise.
* libnetfs/file-chflags.c: Likewise.
* libnetfs/file-chmod.c: Likewise.
* libnetfs/file-chown.c: Likewise.
* libnetfs/file-exec.c: Likewise.
* libnetfs/file-get-storage-info.c: Likewise.
* libnetfs/file-get-translator.c: Likewise.
* libnetfs/file-lock-stat.c: Likewise.
* libnetfs/file-lock.c: Likewise.
* libnetfs/file-reparent.c: Likewise.
* libnetfs/file-set-size.c: Likewise.
* libnetfs/file-set-translator.c: Likewise.
* libnetfs/file-statfs.c: Likewise.
* libnetfs/file-sync.c: Likewise.
* libnetfs/file-syncfs.c: Likewise.
* libnetfs/file-utimes.c: Likewise.
* libnetfs/fsys-getroot.c: Likewise.
* libnetfs/fsys-set-options.c: Likewise.
* libnetfs/init-init.c: Likewise.
* libnetfs/io-clear-some-openmodes.c: Likewise.
* libnetfs/io-duplicate.c: Likewise.
* libnetfs/io-get-openmodes.c: Likewise.
* libnetfs/io-get-owner.c: Likewise.
* libnetfs/io-identity.c: Likewise.
* libnetfs/io-mod-owner.c: Likewise.
* libnetfs/io-read.c: Likewise.
* libnetfs/io-readable.c: Likewise.
* libnetfs/io-reauthenticate.c: Likewise.
* libnetfs/io-restrict-auth.c: Likewise.
* libnetfs/io-revoke.c: Likewise.
* libnetfs/io-seek.c: Likewise.
* libnetfs/io-set-all-openmodes.c: Likewise.
* libnetfs/io-set-some-openmodes.c: Likewise.
* libnetfs/io-stat.c: Likewise.
* libnetfs/io-write.c: Likewise.
* libnetfs/make-node.c: Likewise.
* libnetfs/netfs.h: Likewise.
* libnetfs/nput.c: Likewise.
* libnetfs/nref.c: Likewise.
* libnetfs/nrele.c: Likewise.
* libnetfs/release-peropen.c: Likewise.
* libnetfs/shutdown.c: Likewise.
* libpager/Makefile: Likewise.
* libpager/chg-compl.c: Likewise.
* libpager/clean.c: Likewise.
* libpager/data-request.c: Likewise.
* libpager/data-return.c: Likewise.
* libpager/data-unlock.c: Likewise.
* libpager/inhibit-term.c: Likewise.
* libpager/lock-completed.c: Likewise.
* libpager/lock-object.c: Likewise.
* libpager/mark-error.c: Likewise.
* libpager/no-senders.c: Likewise.
* libpager/object-init.c: Likewise.
* libpager/object-terminate.c: Likewise.
* libpager/offer-page.c: Likewise.
* libpager/pager-attr.c: Likewise.
* libpager/pager-create.c: Likewise.
* libpager/pager-shutdown.c: Likewise.
* libpager/priv.h: Likewise.
* libpager/seqnos.c: Likewise.
* libpipe/Makefile: Likewise.
* libpipe/pipe.c: Likewise.
* libpipe/pipe.h: Likewise.
* libports/Makefile: Likewise.
* libports/begin-rpc.c: Likewise.
* libports/bucket-iterate.c: Likewise.
* libports/claim-right.c: Likewise.
* libports/class-iterate.c: Likewise.
* libports/complete-deallocate.c: Likewise.
* libports/count-bucket.c: Likewise.
* libports/count-class.c: Likewise.
* libports/create-bucket.c: Likewise.
* libports/create-internal.c: Likewise.
* libports/destroy-right.c: Likewise.
* libports/enable-bucket.c: Likewise.
* libports/enable-class.c: Likewise.
* libports/end-rpc.c: Likewise.
* libports/get-right.c: Likewise.
* libports/import-port.c: Likewise.
* libports/inhibit-all-rpcs.c: Likewise.
* libports/inhibit-bucket-rpcs.c: Likewise.
* libports/inhibit-class-rpcs.c: Likewise.
* libports/inhibit-port-rpcs.c: Likewise.
* libports/init.c: Likewise.
* libports/interrupt-notified-rpcs.c: Likewise.
* libports/interrupt-on-notify.c: Likewise.
* libports/interrupt-operation.c: Likewise.
* libports/interrupt-rpcs.c: Likewise.
* libports/interrupted.c: Likewise.
* libports/lookup-port.c: Likewise.
* libports/manage-multithread.c: Likewise.
* libports/no-senders.c: Likewise.
* libports/port-deref-weak.c: Likewise.
* libports/port-deref.c: Likewise.
* libports/port-ref-weak.c: Likewise.
* libports/port-ref.c: Likewise.
* libports/ports.h: Likewise.
* libports/reallocate-from-external.c: Likewise.
* libports/reallocate-port.c: Likewise.
* libports/resume-all-rpcs.c: Likewise.
* libports/resume-bucket-rpcs.c: Likewise.
* libports/resume-class-rpcs.c: Likewise.
* libports/resume-port-rpcs.c: Likewise.
* libports/stubs.c: Likewise.
* libports/transfer-right.c: Likewise.
* libstore/Makefile: Likewise.
* libstore/gunzip.c: Likewise.
* libstore/part.c: Likewise.
* libstore/unzipstore.c: Likewise.
* libthreads/Makefile: Likewise.
* libtreefs/dir-lookup.c: Likewise.
* libtreefs/fsys-getroot.c: Likewise.
* libtreefs/fsys-hooks.c: Likewise.
* libtreefs/fsys.c: Likewise.
* libtreefs/trans-help.c: Likewise.
* libtreefs/trans-start.c: Likewise.
* libtreefs/treefs.h: Likewise.
* libtrivfs/cntl-create.c: Likewise.
* libtrivfs/dyn-classes.c: Likewise.
* libtrivfs/io-reauthenticate.c: Likewise.
* libtrivfs/io-restrict-auth.c: Likewise.
* libtrivfs/protid-clean.c: Likewise.
* libtrivfs/protid-dup.c: Likewise.
* libtrivfs/trivfs.h: Likewise.
* mach-defpager/Makefile: Likewise.
* mach-defpager/default_pager.c: Likewise.
* mach-defpager/kalloc.c: Likewise.
* mach-defpager/main.c: Likewise.
* nfs/Makefile: Likewise.
* nfs/cache.c: Likewise.
* nfs/main.c: Likewise.
* nfs/mount.c: Likewise.
* nfs/name-cache.c: Likewise.
* nfs/nfs.h: Likewise.
* nfs/ops.c: Likewise.
* nfs/rpc.c: Likewise.
* nfsd/Makefile: Likewise.
* nfsd/cache.c: Likewise.
* nfsd/loop.c: Likewise.
* nfsd/main.c: Likewise.
* nfsd/nfsd.h: Likewise.
* pfinet/Makefile: Likewise.
* pfinet/ethernet.c: Likewise.
* pfinet/glue-include/asm/spinlock.h: Likewise.
* pfinet/glue-include/linux/interrupt.h: Likewise.
* pfinet/glue-include/linux/sched.h: Likewise.
* pfinet/glue-include/linux/timer.h: Likewise.
* pfinet/glue-include/linux/wait.h: Likewise.
* pfinet/iioctl-ops.c: Likewise.
* pfinet/io-ops.c: Likewise.
* pfinet/kmem_cache.c: Likewise.
* pfinet/main.c: Likewise.
* pfinet/options.c: Likewise.
* pfinet/pfinet-ops.c: Likewise.
* pfinet/pfinet.h: Likewise.
* pfinet/sched.c: Likewise.
* pfinet/socket-ops.c: Likewise.
* pfinet/socket.c: Likewise.
* pfinet/timer-emul.c: Likewise.
* pfinet/tunnel.c: Likewise.
* pflocal/Makefile: Likewise.
* pflocal/connq.c: Likewise.
* pflocal/io.c: Likewise.
* pflocal/sock.c: Likewise.
* pflocal/sock.h: Likewise.
* pflocal/socket.c: Likewise.
* pflocal/sserver.c: Likewise.
* proc/Makefile: Likewise.
* proc/info.c: Likewise.
* proc/main.c: Likewise.
* proc/mgt.c: Likewise.
* proc/msg.c: Likewise.
* proc/proc.h: Likewise.
* proc/stubs.c: Likewise.
* proc/wait.c: Likewise.
* storeio/Makefile: Likewise.
* storeio/dev.c: Likewise.
* storeio/dev.h: Likewise.
* storeio/open.c: Likewise.
* storeio/open.h: Likewise.
* storeio/pager.c: Likewise.
* storeio/storeio.c: Likewise.
* term/Makefile: Likewise.
* term/devio.c: Likewise.
* term/hurdio.c: Likewise.
* term/main.c: Likewise.
* term/munge.c: Likewise.
* term/ptyio.c: Likewise.
* term/term.h: Likewise.
* term/users.c: Likewise.
* tmpfs/Makefile: Likewise.
* tmpfs/dir.c: Likewise.
* tmpfs/node.c: Likewise.
* tmpfs/tmpfs.c: Likewise.
* tmpfs/tmpfs.h: Likewise.
* trans/Makefile: Likewise.
* trans/fakeroot.c: Likewise.
* trans/fifo.c: Likewise.
* trans/hello-mt.c: Likewise.
* trans/new-fifo.c: Likewise.
* trans/streamio.c: Likewise.
* ufs/Makefile: Likewise.
* ufs/alloc.c: Likewise.
* ufs/dir.c: Likewise.
* ufs/hyper.c: Likewise.
* ufs/inode.c: Likewise.
* ufs/main.c: Likewise.
* ufs/pager.c: Likewise.
* ufs/pokeloc.c: Likewise.
* ufs/sizes.c: Likewise.
* ufs/ufs.h: Likewise.
* usermux/Makefile: Likewise.
* usermux/mux.c: Likewise.
* usermux/node.c: Likewise.
* usermux/usermux.h: Likewise.
* utils/Makefile: Likewise.
* utils/fakeauth.c: Likewise.
* utils/rpctrace.c: Likewise.

1 files changed, 60 insertions, 60 deletions

diff --git a/console-client/console.c b/console-client/console.c
index 06a8c1ac..806bec6d 100644
--- a/console-client/console.c
+++ b/console-client/console.c
@@ -25,7 +25,7 @@
 #include <error.h>
 #include <assert.h>
 
-#include <cthreads.h>
+#include <pthread.h>
 
 #include <hurd/console.h>
 #include <hurd/cons.h>
@@ -45,7 +45,7 @@ const char *cons_client_version = HURD_VERSION;
 
 /* The global lock protects the active_vcons variable, and thus all
    operations on the virtual console that is currently active.  */
-static struct mutex global_lock;
+static pthread_mutex_t global_lock;
 
 /* The active virtual console.  This is the one currently
    displayed.  */
@@ -70,15 +70,15 @@ console_current_id (int *cur)
 {
   vcons_t vcons;
 
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   vcons = active_vcons;
   if (!vcons)
     {
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
       return ENODEV;
     }
   *cur = vcons->id;
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -99,28 +99,28 @@ console_switch (int id, int delta)
      it isn't deallocated while we are outside of the global lock.  We
      also know that */
 
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   vcons = active_vcons;
   if (!vcons)
     {
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
       return EINVAL;
     }
   ports_port_ref (vcons);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 
   err = cons_switch (vcons, id, delta, &new_vcons);
   if (!err)
     {
-      mutex_lock (&global_lock);
+      pthread_mutex_lock (&global_lock);
       if (active_vcons != new_vcons)
         {
           cons_vcons_close (active_vcons);
           active_vcons = new_vcons;
         }
-      mutex_unlock (&new_vcons->lock);
+      pthread_mutex_unlock (&new_vcons->lock);
       ports_port_deref (vcons);
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
     }
   return err;
 }
@@ -134,15 +134,15 @@ console_input (char *buf, size_t size)
   error_t err = 0;
   vcons_t vcons;
 
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   vcons = active_vcons;
   if (!vcons)
     {
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
       return EINVAL;
     }
   ports_port_ref (vcons);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 
   if (vcons)
     {
@@ -161,16 +161,16 @@ console_move_mouse (mouse_event_t ev)
   error_t err;
   vcons_t vcons;
 
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   
   vcons = active_vcons;
   if (!vcons)
     {
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
       return EINVAL;
     }
   ports_port_ref (vcons);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 
   if (vcons)
     {
@@ -178,7 +178,7 @@ console_move_mouse (mouse_event_t ev)
       ports_port_deref (vcons);
     }
 
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 
   return 0;
 }
@@ -192,15 +192,15 @@ console_scrollback (cons_scroll_t type, float value)
   int nr = 0;
   vcons_t vcons;
 
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   vcons = active_vcons;
   if (!vcons)
     {
-      mutex_unlock (&global_lock);
+      pthread_mutex_unlock (&global_lock);
       return EINVAL;
     }
   ports_port_ref (vcons);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 
   if (vcons)
     {
@@ -216,7 +216,7 @@ console_scrollback (cons_scroll_t type, float value)
 void
 console_switch_away (void)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
 
   driver_iterate
     if (driver->ops->save_status)
@@ -226,7 +226,7 @@ console_switch_away (void)
   saved_cons = active_vcons->cons;
   cons_vcons_close (active_vcons);
   active_vcons = NULL;
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 /* Switch back to the console client from an external user of the
@@ -235,7 +235,7 @@ void
 console_switch_back (void)
 {
   vcons_list_t conslist;
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
 
   driver_iterate
     if (driver->ops->restore_status)
@@ -248,22 +248,22 @@ console_switch_back (void)
       err = cons_lookup (saved_cons, saved_id, 1, &conslist);
       if (err)
 	{
-	  mutex_unlock (&global_lock);
+	  pthread_mutex_unlock (&global_lock);
 	  return;
 	}
 
       err = cons_vcons_open (saved_cons, conslist, &active_vcons);
       if (err)
 	{
-	  mutex_unlock (&global_lock);
+	  pthread_mutex_unlock (&global_lock);
 	  return;
 	}
 	
       conslist->vcons = active_vcons;
       saved_cons = NULL;
-      mutex_unlock (&active_vcons->lock);
+      pthread_mutex_unlock (&active_vcons->lock);
     }
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -278,18 +278,18 @@ console_exit (void)
 /* Signal an error to the user.  */
 void console_error (const wchar_t *const err_msg)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   bell_iterate
     if (bell->ops->beep)
       bell->ops->beep (bell->handle);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 #if QUAERENDO_INVENIETIS
 void
 console_deprecated (int key)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   input_iterate
     if (input->ops->deprecated)
       (*input->ops->deprecated) (input->handle, key);
@@ -299,7 +299,7 @@ console_deprecated (int key)
   bell_iterate
     if (bell->ops->deprecated)
       (*bell->ops->deprecated) (bell->handle, key);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 #endif	/* QUAERENDO_INVENIETIS */
 
@@ -312,7 +312,7 @@ void
 cons_vcons_add (cons_t cons, vcons_list_t vcons_entry)
 {
   error_t err = 0;
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (!active_vcons)
     {
       vcons_t vcons;
@@ -324,10 +324,10 @@ cons_vcons_add (cons_t cons, vcons_list_t vcons_entry)
         {
           vcons_entry->vcons = vcons;
           active_vcons = vcons;
-          mutex_unlock (&vcons->lock);
+          pthread_mutex_unlock (&vcons->lock);
         }
     }
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -341,12 +341,12 @@ cons_vcons_add (cons_t cons, vcons_list_t vcons_entry)
 void
 cons_vcons_update (vcons_t vcons)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->update)
 	display->ops->update (display->handle);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -355,12 +355,12 @@ cons_vcons_update (vcons_t vcons)
 void
 cons_vcons_set_cursor_pos (vcons_t vcons, uint32_t col, uint32_t row)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->set_cursor_pos)
 	display->ops->set_cursor_pos (display->handle, col, row);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -369,12 +369,12 @@ cons_vcons_set_cursor_pos (vcons_t vcons, uint32_t col, uint32_t row)
 void
 cons_vcons_set_cursor_status (vcons_t vcons, uint32_t status)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->set_cursor_status)
 	display->ops->set_cursor_status (display->handle, status);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -388,12 +388,12 @@ cons_vcons_set_cursor_status (vcons_t vcons, uint32_t status)
 void
 cons_vcons_scroll (vcons_t vcons, int delta)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->scroll)
 	display->ops->scroll (display->handle, delta);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -407,12 +407,12 @@ cons_vcons_scroll (vcons_t vcons, int delta)
 void cons_vcons_clear (vcons_t vcons, size_t length,
 		       uint32_t col, uint32_t row)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->clear)
 	display->ops->clear (display->handle, length, col, row);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -423,12 +423,12 @@ void
 cons_vcons_write (vcons_t vcons, conchar_t *str, size_t length,
 		  uint32_t col, uint32_t row)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->write)
 	display->ops->write (display->handle, str, length, col, row);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -437,12 +437,12 @@ cons_vcons_write (vcons_t vcons, conchar_t *str, size_t length,
 void
 cons_vcons_beep (vcons_t vcons)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     bell_iterate
       if (bell->ops->beep)
 	bell->ops->beep (bell->handle);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -451,12 +451,12 @@ cons_vcons_beep (vcons_t vcons)
 void
 cons_vcons_flash (vcons_t vcons)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->flash)
 	display->ops->flash (display->handle);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -465,12 +465,12 @@ cons_vcons_flash (vcons_t vcons)
 void
 cons_vcons_set_scroll_lock (vcons_t vcons, int onoff)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     input_iterate
       if (input->ops->set_scroll_lock_status)
 	input->ops->set_scroll_lock_status (input->handle, onoff);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
 }
 
 
@@ -481,12 +481,12 @@ cons_vcons_set_scroll_lock (vcons_t vcons, int onoff)
 error_t
 cons_vcons_set_dimension (vcons_t vcons, uint32_t col, uint32_t row)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->set_dimension)
 	display->ops->set_dimension (display->handle, col, row);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -494,12 +494,12 @@ cons_vcons_set_dimension (vcons_t vcons, uint32_t col, uint32_t row)
 error_t
 cons_vcons_set_mousecursor_pos (vcons_t vcons, float x, float y)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->set_mousecursor_pos)
 	display->ops->set_mousecursor_pos (display->handle, x, y);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
   return 0;
 }
 
@@ -507,12 +507,12 @@ cons_vcons_set_mousecursor_pos (vcons_t vcons, float x, float y)
 error_t
 cons_vcons_set_mousecursor_status (vcons_t vcons, int status)
 {
-  mutex_lock (&global_lock);
+  pthread_mutex_lock (&global_lock);
   if (vcons == active_vcons)
     display_iterate
       if (display->ops->set_mousecursor_status)
 	display->ops->set_mousecursor_status (display->handle, status);
-  mutex_unlock (&global_lock);
+  pthread_mutex_unlock (&global_lock);
   return 0;
 
 }
@@ -615,7 +615,7 @@ main (int argc, char *argv[])
   if (err)
     error (1, err, "Starting driver %s failed", errname);
     
-  mutex_init (&global_lock);
+  pthread_mutex_init (&global_lock, NULL);
 
   err = cons_init ();
   if (err)