[Openmp-commits] [openmp] r231078 - Cleanup provided by Carlo Bertolli

[Andrey Churbanov]

Author: achurbanov
Date: Tue Mar  3 10:19:57 2015
New Revision: 231078

URL: http://llvm.org/viewvc/llvm-project?rev=231078&view=rev
Log:
Cleanup provided by Carlo Bertolli

Modified:
    openmp/trunk/runtime/src/kmp_error.c
    openmp/trunk/runtime/src/kmp_runtime.c

Modified: openmp/trunk/runtime/src/kmp_error.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_error.c?rev=231078&r1=231077&r2=231078&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_error.c (original)
+++ openmp/trunk/runtime/src/kmp_error.c Tue Mar  3 10:19:57 2015
@@ -111,7 +111,7 @@ __kmp_expand_cons_stack( int gtid, struc
 // 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 );

Modified: openmp/trunk/runtime/src/kmp_runtime.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.c?rev=231078&r1=231077&r2=231078&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.c (original)
+++ openmp/trunk/runtime/src/kmp_runtime.c Tue Mar  3 10:19:57 2015
@@ -267,7 +267,8 @@ __kmp_check_stack_overlap( kmp_info_t *t
     }
 
     /* 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 ) {