Hostboot-aware errl tool part 1.

Change-Id: Ibe49dc935206775de032d397b2800a7b83208283
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/630
Tested-by: Jenkins Server
Reviewed-by: Monte K. Copeland <copelanm@us.ibm.com>

1 files changed, 14 insertions, 9 deletions

diff --git a/src/include/usr/errl/errluserdetails.H b/src/include/usr/errl/errluserdetails.H
index 5ed8fe029..7dd052650 100755
--- a/src/include/usr/errl/errluserdetails.H
+++ b/src/include/usr/errl/errluserdetails.H
@@ -48,22 +48,21 @@
 /*****************************************************************************/
 // I n c l u d e s
 /*****************************************************************************/
-#include    <hbotcompid.H>      // list of compid's supported
 
-#include    <errl/errltypes.H>  //  errlver_t, errlsubsec_t
-#include    <errl/errlentry.H>  //  addFFDC, appendFFDC
+
+// safe to include these, PARSER or no PARSER
+#include    <hbotcompid.H>      // list of compid's supported
+#include    <errl/hberrltypes.H>  //  errlver_t, errlsubsec_t
 
 
 
-/*****************************************************************************/
-//  Typedefs
-/*****************************************************************************/
 
+#ifndef PARSER
+#include    <errl/errlentry.H>  //  addFFDC, appendFFDC
 
 namespace ERRORLOG
 {
 
-#ifndef PARSER
 
 /**
  * @brief ERRL User Data Details
@@ -179,6 +178,7 @@ private:
     uint32_t  iv_BufLen;        // Length of internal buffer
 
 };
+} // namespace 
 
 #else // (if PARSER defined)
 
@@ -196,6 +196,10 @@ private:
  *  These will compile and run in the errl tool.
  *
 */
+namespace ERRORLOG
+{
+
+
 class ErrlUserDetails
 {
 public:
@@ -251,8 +255,9 @@ private:
     ErrlUserDetails & operator=(const ErrlUserDetails &);
 };
 
-#endif //PARSER
+} // namespace
 
-} // end namespace
+
+#endif //PARSER
 
 #endif