Index: trunk/Ohana/src/opihi/include/pantasks.h
===================================================================
--- trunk/Ohana/src/opihi/include/pantasks.h	(revision 23530)
+++ trunk/Ohana/src/opihi/include/pantasks.h	(revision 27435)
@@ -269,7 +269,4 @@
 int CheckJobsGetState (void);
 
-// void *CheckTasksThread (void *data);
-// void *CheckJobsThread (void *data);
-
 void CheckControllerSetState (int state);
 int CheckControllerGetState (void);
@@ -287,12 +284,12 @@
 void CheckInputs (void);
 
-void ClientThreadLock (void);
-void ClientThreadUnlock (void);
-void CommandThreadLock (void);
-void CommandThreadUnlock (void);
-void ControlThreadLock (void);
-void ControlThreadUnlock (void);
-void JobTaskThreadLock (void);
-void JobTaskThreadUnlock (void);
+void ClientLock (void);
+void ClientUnlock (void);
+void CommandLock (void);
+void CommandUnlock (void);
+void ControlLock (const char *func);
+void ControlUnlock (const char *func);
+void JobTaskLock (void);
+void JobTaskUnlock (void);
 
 int InitPassword (void);