From 716f2679a7fe61be8d638d7da806e0a6809cc7b4 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 29 Jul 2014 12:21:07 -0400
Subject: [PATCH] thread pool: don't use reserved names

Avoid global symbols with leading underscore
---
 src/libCom/pool/epicsThreadPool.h | 4 ++--
 src/libCom/pool/poolJob.c         | 4 ++--
 src/libCom/pool/threadPool.c      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libCom/pool/epicsThreadPool.h b/src/libCom/pool/epicsThreadPool.h
index b8d991f58..ef6f2f3ba 100644
--- a/src/libCom/pool/epicsThreadPool.h
+++ b/src/libCom/pool/epicsThreadPool.h
@@ -94,8 +94,8 @@ epicsShareFunc int epicsThreadPoolWait(epicsThreadPool* pool, double timeout);
  * the argument passed to the job callback
  * will be the epicsJob*
  */
-#define EPICSJOB_SELF _epicsJobArgSelf
-epicsShareExtern void* _epicsJobArgSelf;
+#define EPICSJOB_SELF epicsJobArgSelfMagic
+epicsShareExtern void* epicsJobArgSelfMagic;
 
 /* creates, but does not add, a new job.
  * If pool in NULL then the job is not associated with any pool and
diff --git a/src/libCom/pool/poolJob.c b/src/libCom/pool/poolJob.c
index 0b731767b..03dc100fa 100644
--- a/src/libCom/pool/poolJob.c
+++ b/src/libCom/pool/poolJob.c
@@ -22,7 +22,7 @@
 #include "epicsThreadPool.h"
 #include "poolPriv.h"
 
-void* _epicsJobArgSelf = &_epicsJobArgSelf;
+void* epicsJobArgSelfMagic = &epicsJobArgSelfMagic;
 
 static
 void workerMain(void* arg)
@@ -148,7 +148,7 @@ epicsJob* epicsJobCreate(epicsThreadPool* pool,
     if(!job)
         return NULL;
 
-    if(arg==&_epicsJobArgSelf)
+    if(arg==&epicsJobArgSelfMagic)
         arg=job;
 
     job->pool=NULL;
diff --git a/src/libCom/pool/threadPool.c b/src/libCom/pool/threadPool.c
index 2c373f23b..72677b2ce 100644
--- a/src/libCom/pool/threadPool.c
+++ b/src/libCom/pool/threadPool.c
@@ -102,7 +102,7 @@ cleanup:
 }
 
 static
-void _epicsThreadPoolControl(epicsThreadPool* pool, epicsThreadPoolOption opt, unsigned int val)
+void epicsThreadPoolControlImpl(epicsThreadPool* pool, epicsThreadPoolOption opt, unsigned int val)
 {
     if(pool->freezeopt)
         return;
@@ -147,7 +147,7 @@ void _epicsThreadPoolControl(epicsThreadPool* pool, epicsThreadPoolOption opt, u
 void epicsThreadPoolControl(epicsThreadPool* pool, epicsThreadPoolOption opt, unsigned int val)
 {
     epicsMutexMustLock(pool->guard);
-    _epicsThreadPoolControl(pool, opt, val);
+    epicsThreadPoolControlImpl(pool, opt, val);
     epicsMutexUnlock(pool->guard);
 }
 
@@ -206,8 +206,8 @@ void epicsThreadPoolDestroy(epicsThreadPool *pool)
     epicsMutexMustLock(pool->guard);
 
     /* run remaining queued jobs */
-    _epicsThreadPoolControl(pool, epicsThreadPoolQueueAdd, 0);
-    _epicsThreadPoolControl(pool, epicsThreadPoolQueueRun, 1);
+    epicsThreadPoolControlImpl(pool, epicsThreadPoolQueueAdd, 0);
+    epicsThreadPoolControlImpl(pool, epicsThreadPoolQueueRun, 1);
     nThr=pool->threadsRunning;
     pool->freezeopt = 1;