4 files changed, 6 insertions, 4 deletions
diff --git a/src/usr/diag/attn/test/attnfakepresenter.C b/src/usr/diag/attn/test/attnfakepresenter.C
index db0d84dc9..81a7ea2f8 100644
--- a/src/usr/diag/attn/test/attnfakepresenter.C
+++ b/src/usr/diag/attn/test/attnfakepresenter.C
@@ -188,7 +188,7 @@ bool FakePresenter::wait(msg_q_t i_q)
     return shutdown;
 }
 
-void FakePresenter::main(void * i_properties)
+void* FakePresenter::main(void * i_properties)
 {
     PresenterProperties * properties
         = static_cast<PresenterProperties *>(i_properties);
@@ -204,6 +204,7 @@ void FakePresenter::main(void * i_properties)
     }
 
     delete properties;
+    return NULL;
 }
 
 FakePresenter::FakePresenter()
diff --git a/src/usr/diag/attn/test/attnfakepresenter.H b/src/usr/diag/attn/test/attnfakepresenter.H
index 4fe250ba7..280a1f666 100644
--- a/src/usr/diag/attn/test/attnfakepresenter.H
+++ b/src/usr/diag/attn/test/attnfakepresenter.H
@@ -116,7 +116,7 @@ class FakePresenter
          *
          * @param[in] i_properties The presenter on which to call wait.
          */
-        static void main(void * i_properties);
+        static void* main(void * i_properties);
 
         /**
          * @brief iv_mutex Shared data access serialization.
diff --git a/src/usr/diag/attn/test/attnrandsource.C b/src/usr/diag/attn/test/attnrandsource.C
index daa09a4a8..b6d71d18d 100644
--- a/src/usr/diag/attn/test/attnrandsource.C
+++ b/src/usr/diag/attn/test/attnrandsource.C
@@ -73,11 +73,12 @@ bool RandSource::wait()
     return true;
 }
 
-void RandSource::main(void * i_source)
+void* RandSource::main(void * i_source)
 {
     RandSource * src = static_cast<RandSource *>(i_source);
 
     src->run();
+    return NULL;
 }
 
 void RandSource::run()
diff --git a/src/usr/diag/attn/test/attnrandsource.H b/src/usr/diag/attn/test/attnrandsource.H
index 50634fc9e..396690505 100644
--- a/src/usr/diag/attn/test/attnrandsource.H
+++ b/src/usr/diag/attn/test/attnrandsource.H
@@ -94,7 +94,7 @@ class RandSource
          *
          * @param[in] i_source The source on which to call run.
          */
-        static void main(void * i_source);
+        static void* main(void * i_source);
 
         /**
          * @brief run Execute the testcase.