Merge branch 'dev' into major

blackberry · Sep 19, 2011 · bdc4bab · bdc4bab
2 parents 50dc9c8 + 171407b
commit bdc4bab
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
@@ -990,8 +990,9 @@ erts_mtx_destroy(erts_mtx_t *mtx)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy mutex");
+	    erts_thr_fatal_error(res, "destroy mutex");
     }
 #endif
 }
@@ -1094,8 +1095,9 @@ erts_cnd_destroy(erts_cnd_t *cnd)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy condition variable");
+	    erts_thr_fatal_error(res, "destroy condition variable");
     }
 #endif
 }
@@ -1229,8 +1231,9 @@ erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwmutex");
+	    erts_thr_fatal_error(res, "destroy rwmutex");
     }
 #endif
 }
@@ -1693,8 +1696,9 @@ erts_spinlock_destroy(erts_spinlock_t *lock)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwlock");
+	    erts_thr_fatal_error(res, "destroy rwlock");
     }
 #else
     (void)lock;
@@ -1811,8 +1815,9 @@ erts_rwlock_destroy(erts_rwlock_t *lock)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwlock");
+	    erts_thr_fatal_error(res, "destroy rwlock");
     }
 #else
     (void)lock;