From 6ef0acf99fbfe2ec27868a6178eac319c08dd7a3 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Mon, 21 Aug 2006 21:55:41 +0000
Subject: [PATCH] The names of the defines should start with OPAL as they
 belong to the OPAL layer. We now support 64 bits Windows too.

This commit was SVN r11312.
---
 opal/include/opal_config_bottom.h  | 8 +++++---
 opal/tools/wrappers/opal_wrapper.c | 6 +++---
 orte/tools/orterun/orterun.c       | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/opal/include/opal_config_bottom.h b/opal/include/opal_config_bottom.h
index 3afeceedd8..8e3d660f28 100644
--- a/opal/include/opal_config_bottom.h
+++ b/opal/include/opal_config_bottom.h
@@ -48,7 +48,7 @@
  *
  **********************************************************************/
 #ifndef __WINDOWS__
-#  if defined(_WIN32) || defined(WIN32)
+#  if defined(_WIN32) || defined(WIN32) || defined(WIN64)
 #    define __WINDOWS__
 #  endif
 #endif
@@ -143,9 +143,11 @@ typedef long long bool;
  * Set the compile-time path-separator on this system
  */
 #ifdef __WINDOWS__
-#define OMPI_PATH_SEP "\\"
+#define OPAL_PATH_SEP "\\"
+#define OPAL_ENV_SEP  ';'
 #else
-#define OMPI_PATH_SEP "/"
+#define OPAL_PATH_SEP "/"
+#define OPAL_ENV_SEP  ':'
 #endif
 
 /*
diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
index c486a64c77..e8060cdd0d 100644
--- a/opal/tools/wrappers/opal_wrapper.c
+++ b/opal/tools/wrappers/opal_wrapper.c
@@ -95,7 +95,7 @@ data_callback(const char *key, const char *value)
 
         for (i = 0 ; i < opal_argv_count(values) ; ++i) {
             char *line;
-            asprintf(&line, "-I%s%s%s", OPAL_INCLUDEDIR, OMPI_PATH_SEP, values[i]);
+            asprintf(&line, "-I%s%s%s", OPAL_INCLUDEDIR, OPAL_PATH_SEP, values[i]);
             opal_argv_append_nosize(&data.preproc_flags, line);
             free(line);
         }
@@ -174,7 +174,7 @@ data_init(const char *appname)
 
     /* now load the data */
     asprintf(&datafile, "%s%s%s-wrapper-data.txt", 
-             OPAL_PKGDATADIR, OMPI_PATH_SEP, appname);
+             OPAL_PKGDATADIR, OPAL_PATH_SEP, appname);
     if (NULL == datafile) return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
 
     ret = opal_util_keyval_parse(datafile, data_callback);
@@ -346,7 +346,7 @@ main(int argc, char *argv[])
         if (data.req_file[0] != '\0') {
             char *filename;
             struct stat buf;
-            asprintf(&filename, "%s%s%s", OPAL_LIBDIR, OMPI_PATH_SEP, data.req_file);
+            asprintf(&filename, "%s%s%s", OPAL_LIBDIR, OPAL_PATH_SEP, data.req_file);
             if (0 != stat(filename, &buf)) {
                 opal_show_help("help-opal-wrapper.txt", "file-not-found", true,
                                base_argv0, data.req_file, data.language, NULL);
diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index 2ed0038d43..2b4a1cb80c 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -1325,7 +1325,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
         if (NULL != param) {
             /* "Parse" the param, aka remove superfluous path_sep "/". */
             param_len = strlen(param);
-            while (0 == strcmp (OMPI_PATH_SEP, &(param[param_len-1]))) {
+            while (0 == strcmp (OPAL_PATH_SEP, &(param[param_len-1]))) {
                 param[param_len-1] = '\0';
                 param_len--;
                 if (0 == param_len) {