diff options
| -rw-r--r-- | openmp/runtime/src/kmp_error.c | 4 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_runtime.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/openmp/runtime/src/kmp_error.c b/openmp/runtime/src/kmp_error.c index b76c1092f07..825157afb47 100644 --- a/openmp/runtime/src/kmp_error.c +++ b/openmp/runtime/src/kmp_error.c @@ -111,7 +111,7 @@ __kmp_expand_cons_stack( int gtid, struct cons_header *p ) // NOTE: Function returns allocated memory, caller must free it! static char const * __kmp_pragma( - enum cons_type ct, + int ct, ident_t const * ident ) { char const * cons = NULL; // Construct name. @@ -121,7 +121,7 @@ __kmp_pragma( kmp_str_buf_t buffer; kmp_msg_t prgm; __kmp_str_buf_init( & buffer ); - if ( 0 < ct && ct <= cons_text_c_num ) {; + if ( 0 < ct && ct <= cons_text_c_num ) { cons = cons_text_c[ ct ]; } else { KMP_DEBUG_ASSERT( 0 ); diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c index 55b58ce5a12..0a0899310d7 100644 --- a/openmp/runtime/src/kmp_runtime.c +++ b/openmp/runtime/src/kmp_runtime.c @@ -267,7 +267,8 @@ __kmp_check_stack_overlap( kmp_info_t *th ) } /* No point in checking ubermaster threads since they use refinement and cannot overlap */ - if ( __kmp_env_checks == TRUE && !KMP_UBER_GTID(gtid = __kmp_gtid_from_thread( th ))) + gtid = __kmp_gtid_from_thread( th ); + if ( __kmp_env_checks == TRUE && !KMP_UBER_GTID(gtid)) { KA_TRACE(10,("__kmp_check_stack_overlap: performing extensive checking\n")); if ( stack_beg == NULL ) { |
