Merge branch 'develop' of github.com:xianyi/OpenBLAS into develop

Author: xianyi

common_s.h

@@ -17,7 +17,7 @@
 #define	SCOPY_K			scopy_k
 #define	SDOTU_K			sdot_k
 #define	SDOTC_K			sdot_k
-#define	SDSDOT_K		sdot_k
+#define	SDSDOT_K		dsdot_k
 #define	DSDOT_K			dsdot_k
 #define	SNRM2_K			snrm2_k
 #define	SSCAL_K			sscal_k
@@ -162,7 +162,7 @@
 #define	SCOPY_K			gotoblas -> scopy_k
 #define	SDOTU_K			gotoblas -> sdot_k
 #define	SDOTC_K			gotoblas -> sdot_k
-#define	SDSDOT_K		gotoblas -> sdot_k
+#define	SDSDOT_K		gotoblas -> dsdot_k
 #define	DSDOT_K			gotoblas -> dsdot_k
 #define	SNRM2_K			gotoblas -> snrm2_k
 #define	SSCAL_K			gotoblas -> sscal_k

driver/others/memory.c

@@ -264,9 +264,9 @@ void openblas_fork_handler()
   //   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60035
   // In the mean time build with USE_OPENMP=0 or link against another
   // implementation of OpenMP.
-#ifndef OS_WINDOWS
+#if !defined(OS_WINDOWS) && defined(SMP_SERVER)
   int err;
-  err = pthread_atfork (BLASFUNC(blas_thread_shutdown), NULL, NULL);
+  err = pthread_atfork ((void (*)(void)) BLASFUNC(blas_thread_shutdown), NULL, NULL);
   if(err != 0)
     openblas_warning(0, "OpenBLAS Warning ... cannot install fork handler. You may meet hang after fork.\n");
 #endif