From 663175df1ac4a64e880a808d7f6bd16473ab761e Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 22 Aug 2006 23:49:57 +0000 Subject: [PATCH] C++ comments are not allowed. This commit was SVN r11338. --- opal/tools/wrappers/opal_wrapper.c | 1 - opal/util/basename.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c index de7246d67e..82702e3c43 100644 --- a/opal/tools/wrappers/opal_wrapper.c +++ b/opal/tools/wrappers/opal_wrapper.c @@ -582,7 +582,6 @@ main(int argc, char *argv[]) free(exec_argv[0]); exec_argv[0] = tmp; - //free(tmp); ret = opal_few(exec_argv, &status); exit_status = WIFEXITED(status) ? WEXITSTATUS(status) : (WIFSIGNALED(status) ? WTERMSIG(status) : diff --git a/opal/util/basename.c b/opal/util/basename.c index de39bcd88d..8df54115de 100644 --- a/opal/util/basename.c +++ b/opal/util/basename.c @@ -20,6 +20,9 @@ #include #include +#if HAVE_DIRNAME +#include +#endif /* HAVE_DIRNAME */ #include "opal/util/basename.h" #include "opal/util/os_path.h" @@ -42,7 +45,7 @@ static inline char* opal_find_last_path_separator( const char* filename, size_t if( (*p != '\\') && (*p != '/') ) break; #else - if( *p != OPAL_PATH_SEP ) + if( *p != OPAL_PATH_SEP[0] ) break; #endif /* defined(__WINDOWS__) */ } @@ -52,7 +55,7 @@ static inline char* opal_find_last_path_separator( const char* filename, size_t if( (*p == '\\') || (*p == '/') ) return p; #else - if( *p == OPAL_PATH_SEP ) + if( *p == OPAL_PATH_SEP[0] ) return p; #endif /* defined(__WINDOWS__) */ }