Fix some missing includes and one #ifdef that shouldn't have been

 included

Thanks to Paul Hargrove for identifying the problem and suggesting a fix.

Signed-off-by: Ralph Castain <[email protected]>
(cherry picked from commit on PMIx v1.2 branch openpmix/openpmix@4269e84)
Signed-off-by: Joshua Hursey <[email protected]>

Author: jjhursey

opal/mca/pmix/pmix112/pmix/include/pmix/pmix_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+ * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -50,9 +50,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h> /* for struct timeval */
-#endif
+
 #include <pmix_version.h>
 
 #if defined(c_plusplus) || defined(__cplusplus)

opal/mca/pmix/pmix112/pmix/src/sm/pmix_mmap.c

@@ -3,13 +3,15 @@
  *                         All rights reserved.
  * Copyright (c) 2017      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  */
 
+#include <src/include/pmix_config.h>
 
 #include <unistd.h>
 #ifdef HAVE_SYS_TYPES_H

opal/mca/pmix/pmix112/pmix/src/sm/pmix_sm.c

@@ -1,12 +1,14 @@
 /*
  * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  */
+#include <src/include/pmix_config.h>
 
 #include <pmix/pmix_common.h>
 #include "src/include/pmix_globals.h"

opal/mca/pmix/pmix112/pmix/src/sm/pmix_sm.h

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -11,6 +12,8 @@
 #ifndef PMIX_SM_H
 #define PMIX_SM_H
 
+#include <src/include/pmix_config.h>
+
 #include <pmix/pmix_common.h>
 #include <src/include/pmix_config.h>