From bd5bcdc8a3e636593edcc3d4ff6da75b9c2c2adf Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Tue, 17 Jan 2006 13:22:08 +0000
Subject: [PATCH] Add missing include files for x86 builds.

This commit was SVN r8710.
---
 opal/tools/wrappers/opal_wrapper.c | 6 ++++++
 opal/util/keyval_parse.c           | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
index fbdacfc43e..f0e3eb0f52 100644
--- a/opal/tools/wrappers/opal_wrapper.c
+++ b/opal/tools/wrappers/opal_wrapper.c
@@ -20,6 +20,9 @@
 
 #include <stdio.h>
 #include <errno.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif  /*  HAVE_STDLIB_H */
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
@@ -32,6 +35,9 @@
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
 
 #include "opal/runtime/opal.h"
 #include "opal/include/constants.h"
diff --git a/opal/util/keyval_parse.c b/opal/util/keyval_parse.c
index b2549c1be3..474fd05110 100644
--- a/opal/util/keyval_parse.c
+++ b/opal/util/keyval_parse.c
@@ -6,7 +6,9 @@
 #include "opal/util/keyval/keyval_lex.h"
 #include "opal/util/output.h"
 #include "opal/threads/mutex.h"
-
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif  /* HAVE_STRING_H */
 
 static const char *keyval_filename;
 static opal_keyval_parse_fn_t keyval_callback;
@@ -106,7 +108,7 @@ static int parse_line(void)
         }
         key_buffer = tmp;
     }
-        
+
     strncpy(key_buffer, opal_util_keyval_yytext, key_buffer_len);
 
     /* The first thing we have to see is an "=" */