- Use proper prefixes for all #include statements (opal/, orte/, and

ompi/).
- There's still a handful of places that have orte/ #include files;
  still need to clean those up
- A lot of places still use ompi/include/constants.h -- those need to
  be converted over to use OPAL_ return codes and then switch to the
  opal constants.h.  This commit is the first few steps towards
  that...

This commit was SVN r6843.

opal/class/opal_free_list.h

@@ -22,7 +22,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/threads/thread.h"
 #include "opal/threads/condition.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

opal/class/opal_hash_table.c

@@ -19,10 +19,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "include/constants.h"
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
-#include "class/opal_hash_table.h"
+#include "opal/class/opal_hash_table.h"
+#include "ompi/include/constants.h"
 
 /*
  * opal_hash_table_t

opal/class/opal_list.c

@@ -16,8 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
 #include "opal/class/opal_list.h"
+#include "ompi/include/constants.h"
 
 /*
  *  List classes

opal/class/opal_object.c

@@ -24,9 +24,9 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
-#include "include/sys/atomic.h"
+#include "opal/include/sys/atomic.h"
 #include "opal/class/opal_object.h"
+#include "ompi/include/constants.h"
 
 /*
  * Instantiation of class descriptor for the base class.  This is

opal/class/opal_value_array.h

@@ -17,14 +17,15 @@
 #ifndef OPAL_VALUE_ARRAY_H
 #define OPAL_VALUE_ARRAY_H
 
-#include <string.h>
 #include "ompi_config.h"
-#include "include/constants.h"
-#include "include/types.h"
+
+#include <string.h>
+
 #include "opal/class/opal_object.h"
 #if OMPI_ENABLE_DEBUG
 #include "opal/util/output.h"
 #endif
+#include "ompi/include/constants.h"
 
 /*
  *  @file  Array of elements maintained by value.

opal/event/event.c

@@ -58,13 +58,12 @@
 #define log_error(x)    perror(x)
 #endif
 
-#include "event.h"
-#include "include/types.h"
-#include "include/constants.h"
+#include "opal/event/event.h"
 #include "opal/class/opal_object.h"
 #include "opal/threads/mutex.h"
 #include "opal/threads/thread.h"
 #include "opal/util/output.h"
+#include "ompi/include/constants.h"
 
 #if defined(HAVE_SELECT) && HAVE_SELECT
 extern const struct opal_eventop opal_selectops;

opal/include/opal_constants.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-#ifndef OPAL_CONSTANTS_H
-#define OPAL_CONSTANTS_H
-
-/* error codes */
-
-#define OPAL_SUCCESS 0
-#define OPAL_ERROR -1
-#define OPAL_ERR_OUT_OF_RESOURCE -2
-#define OPAL_ERR_IN_ERRNO -3
-#define OPAL_ERR_NOT_FOUND -4
-
-#endif /* OPAL_CONSTANTS_H */
-

opal/mca/base/mca_base_close.c

@@ -17,9 +17,9 @@
 #include "ompi_config.h"
 
 #include "opal/util/output.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
-#include "include/constants.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 /*
  * Main MCA shutdown.

opal/mca/base/mca_base_cmd_line.c

@@ -19,11 +19,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "include/constants.h"
 #include "opal/util/cmd_line.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 
 /* 

opal/mca/base/mca_base_component_find.c

@@ -23,14 +23,14 @@
 
 #if OMPI_WANT_LIBLTDL
 /* Ensure to get the right <ltdl.h> */ 
-#include "libltdl/ltdl.h"
+#include "opal/libltdl/ltdl.h"
 #endif
 
-#include "include/constants.h"
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 
 /*

opal/mca/base/mca_base_component_repository.c

@@ -25,13 +25,13 @@
 
 #if OMPI_WANT_LIBLTDL
 /* Ensure to get the right <ltdl.h> */ 
-#include "libltdl/ltdl.h"
+#include "opal/libltdl/ltdl.h"
 #endif
 
-#include "include/constants.h"
 #include "opal/class/opal_list.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 #if OMPI_WANT_LIBLTDL
 

opal/mca/base/mca_base_components_close.c

@@ -18,9 +18,9 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
-#include "include/constants.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 int mca_base_components_close(int output_id, 
                               opal_list_t *components_available, 

opal/mca/base/mca_base_components_open.c

@@ -25,9 +25,9 @@
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
-#include "include/constants.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 struct component_name_t {
   opal_list_item_t super;

opal/mca/base/mca_base_msgbuf.c

@@ -17,10 +17,10 @@
 #include "ompi_config.h"
 
 #include "opal/util/output.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
-#include "include/constants.h"
-#include "mca/base/mca_base_msgbuf_internal.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_msgbuf_internal.h"
+#include "ompi/include/constants.h"
 
 /* 
  * local prototypes 

opal/mca/base/mca_base_open.c

@@ -22,11 +22,12 @@
 #if HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
-#include "include/constants.h"
+
 #include "opal/util/output.h"
 #include "opal/util/printf.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "ompi/include/constants.h"
 
 /*
  * Public variables

opal/mca/base/mca_base_param.c

@@ -20,11 +20,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "mpi.h"
-#include "include/constants.h"
 #include "opal/class/opal_value_array.h"
 #include "opal/util/show_help.h"
-#include "class/opal_hash_table.h"
+#include "opal/class/opal_hash_table.h"
 #if 0
 /* JMS commented out for now -- see lookup_keyvals() below for an
    explanation */
@@ -32,9 +30,10 @@
 #endif
 #include "opal/util/printf.h"
 #include "opal/util/argv.h"
-#include "mca/mca.h"
-#include "mca/base/mca_base_param.h"
-#include "mca/base/mca_base_param_internal.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param_internal.h"
+#include "ompi/include/constants.h"
 
 
 /*
@@ -806,7 +805,7 @@ static int param_register(const char *type_name,
 
   OBJ_CONSTRUCT(&param, mca_base_param_t);
   param.mbp_type = type;
-  param.mbp_keyval = MPI_KEYVAL_INVALID;
+  param.mbp_keyval = -1;
   param.mbp_internal = internal;
   param.mbp_read_only = read_only;
   if (NULL != help_msg) {

opal/mca/base/mca_base_parse_paramfile.c

@@ -19,13 +19,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
-#include "mca/base/base.h"
-#include "mca/base/mca_base_param_internal.h"
-#include "mca/base/mca_base_parse_paramfile_lex.h"
+#include "opal/mca/mca.h"
+#include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_param_internal.h"
+#include "opal/mca/base/mca_base_parse_paramfile_lex.h"
+#include "ompi/include/constants.h"
 
 
 static const char *filename;

opal/memory/memory.c

@@ -18,11 +18,11 @@
 
 #include <sys/types.h>
 
-#include "ompi/include/constants.h"
 #include "opal/memory/memory.h"
 #include "opal/memory/memory_internal.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
+#include "ompi/include/constants.h"
 
 
 /* 

opal/runtime/opal_finalize.c

@@ -18,13 +18,13 @@
 
 #include "orte_config.h"
 
-#include "include/orte_constants.h"
 #include "opal/class/opal_object.h"
 #include "opal/util/output.h"
 #include "opal/util/malloc.h"
 #include "opal/memory/memory.h"
-#include "mca/base/base.h"
-#include "runtime/opal.h"
+#include "opal/mca/base/base.h"
+#include "opal/runtime/opal.h"
+#include "orte/include/orte_constants.h"
 
 /**
  * Finalize the OPAL utilities

opal/runtime/opal_init.c

@@ -18,13 +18,12 @@
 
 #include "orte_config.h"
 
-#include "include/orte_constants.h"
+#include "orte/include/orte_constants.h"
 #include "opal/util/malloc.h"
 #include "opal/util/output.h"
 #include "opal/memory/memory.h"
-#include "mca/base/base.h"
-
-#include "runtime/opal.h"
+#include "opal/mca/base/base.h"
+#include "opal/runtime/opal.h"
 
 /**
  * Initialize the OPAL utilities

opal/runtime/opal_progress.c

@@ -22,8 +22,8 @@
 
 #include "opal/runtime/opal_progress.h"
 #include "opal/event/event.h"
-#include "include/constants.h"
-#include "mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/include/constants.h"
 
 /* 
  * default parameters 

opal/threads/thread.c

@@ -16,8 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
 #include "opal/threads/thread.h"
+#include "ompi/include/constants.h"
 
 
 static void opal_thread_construct(opal_thread_t *t);

opal/util/argv.c

@@ -18,9 +18,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "include/constants.h"
 #include "opal/util/argv.h"
 #include "opal/util/strncpy.h"
+#include "ompi/include/constants.h"
 
 #define ARGSIZE 128
 

opal/util/basename.c

@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "include/constants.h"
 #include "opal/util/basename.h"
+#include "ompi/include/constants.h"
 
 
 char *opal_basename(const char *filename)

opal/util/cmd_line.c

@@ -20,7 +20,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "include/constants.h"
 #include "opal/class/opal_object.h"
 #include "opal/class/opal_list.h"
 #include "opal/threads/mutex.h"
@@ -28,7 +27,8 @@
 #include "opal/util/cmd_line.h"
 #include "opal/util/strncpy.h"
 #include "opal/util/output.h"
-#include "mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/include/constants.h"
 
 
 /*

opal/util/convert.c

@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "include/constants.h"
 #include "opal/util/convert.h"
+#include "ompi/include/constants.h"
 
 #if SIZEOF_SIZE_T <= SIZEOF_INT
 /*

opal/util/daemon_init.c

@@ -26,8 +26,9 @@
 #endif
 #include <stdlib.h>
 
-#include "include/constants.h"
 #include "opal/util/daemon_init.h"
+#include "ompi/include/constants.h"
+
 
 int opal_daemon_init(char *working_dir)
 {

opal/util/few.c

@@ -27,8 +27,8 @@
 #include <unistd.h>
 #endif
 
-#include "include/constants.h"
 #include "opal/util/few.h"
+#include "ompi/include/constants.h"
 
 int opal_few(char *argv[], int *status)
 {

opal/util/if.c

@@ -54,11 +54,11 @@
 #include <netdb.h>
 #endif
 
-#include "include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/if.h"
 #include "opal/util/output.h"
 #include "opal/util/strncpy.h"
+#include "ompi/include/constants.h"
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN
 

opal/util/opal_environ.c

@@ -20,10 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "include/constants.h"
 #include "opal/util/printf.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
+#include "ompi/include/constants.h"
 
 
 /*

opal/util/os_create_dirpath.c

@@ -26,10 +26,10 @@
 #endif
 #include <stdlib.h>
 
-#include "include/constants.h"
 #include "opal/util/os_create_dirpath.h"
-#include "util/sys_info.h"
 #include "opal/util/argv.h"
+#include "opal/util/sys_info.h"
+#include "ompi/include/constants.h"
 
 int opal_os_create_dirpath(const char *path, const mode_t mode)
 {

opal/util/os_path.c

@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include "include/constants.h"
-#include "util/sys_info.h"
+#include "opal/util/sys_info.h"
 #include "opal/util/os_path.h"
-#include "util/sys_info.h"
+#include "opal/util/sys_info.h"
+#include "ompi/include/constants.h"
 
 char *opal_os_path(bool relative, ...)
 {

opal/util/output.c

@@ -31,9 +31,9 @@
 #include <sys/param.h>
 #endif
 
-#include "include/constants.h"
 #include "opal/util/output.h"
 #include "opal/threads/mutex.h"
+#include "ompi/include/constants.h"
 
 /*
  * Private data

opal/util/show_help.c

@@ -20,11 +20,11 @@
 #include <string.h>
 #include <locale.h>
 
-#include "include/constants.h"
 #include "opal/util/show_help.h"
 #include "opal/util/show_help_lex.h"
 #include "opal/util/printf.h"
 #include "opal/util/argv.h"
+#include "ompi/include/constants.h"
 
 static int open_file(const char *base, const char *topic);
 static int find_topic(const char *base, const char *topic);

opal/util/stacktrace.c

@@ -15,7 +15,6 @@
  */
 
 #include "ompi_config.h"
-#include "include/constants.h"
 
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
@@ -35,7 +34,8 @@
 #endif
 
 #include "opal/util/stacktrace.h"
-#include "mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/include/constants.h"
 
 #ifndef _NSIG
 #define _NSIG 32

opal/util/sys_info.c

@@ -29,11 +29,11 @@
 #include <sys/stat.h>
 
 
-#include "include/orte_constants.h"
-#include "mca/errmgr/errmgr.h"
+#include "orte/mca/errmgr/errmgr.h"
 #include "opal/util/output.h"
 #include "opal/util/printf.h"
-#include "mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "orte/include/orte_constants.h"
 
 
 #include "util/sys_info.h"