Merge branch 'master' into develop

2012-03-23 00:00:13 +08:00 · 2012-03-23 00:00:13 +08:00 · b4ec36debc
parent 1f15bee02a fda39c6cb0
commit b4ec36debc
2 changed files with 6 additions and 0 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@ -3,6 +3,8 @@ OpenBLAS ChangeLog
 Version 0.1 alpha2.5
 19-Feb-2012
 common:
+	* Fixed missing "#include <sched.h>" bug on Mac OS X.
+	  Thank Mike Nolta for the patch.
 	* Upgraded LAPACK to 3.4.0 version
 	* Fixed a bug on Mac OS X. Don't require SystemStubs on OS X.
 	  SystemStubs does not exist on Lion. Thank Stefan Karpinski.
--- a/common.h
+++ b/common.h
@ -89,6 +89,10 @@ extern "C" {
 #include <sched.h>
 #endif

+#ifdef OS_DARWIN
+#include <sched.h>
+#endif
+
 #ifdef OS_WINDOWS
 #ifdef  ATOM
 #define GOTO_ATOM ATOM