Fixed #315. Added OPENBLAS_ prefix to openblas_config.h.

diff --git a/Makefile.install b/Makefile.install
index cbe98bc..8319b46 100644 (file)
--- a/Makefile.install
+++ b/Makefile.install
@@ -23,8 +23,8 @@ install :     lib.grd
 #for inc 
        @echo \#ifndef OPENBLAS_CONFIG_H > $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
        @echo \#define OPENBLAS_CONFIG_H >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
-       @cat config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
-       @echo \#define VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
+       @awk '{print $$1, "OPENBLAS_"$$2, $$3}' config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
+       @echo \#define OPENBLAS_VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
        @cat openblas_config_template.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
        @echo \#endif  \/\* OPENBLAS_CONFIG_H \*\/ >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
 

diff --git a/openblas_config_template.h b/openblas_config_template.h
index 1017caf..3b3435b 100644 (file)
--- a/openblas_config_template.h
+++ b/openblas_config_template.h
@@ -1,8 +1,8 @@
 /*This is only for "make install" target.*/
 
-#if defined(OS_WINNT) || defined(OS_CYGWIN_NT) || defined(OS_INTERIX)
-#define WINDOWS_ABI
-#define OS_WINDOWS
+#if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX)
+#define OPENBLAS_WINDOWS_ABI
+#define OPENBLAS_OS_WINDOWS
 
 #ifdef DOUBLE
 #define DOUBLE_DEFINED DOUBLE
@@ -10,23 +10,23 @@
 #endif
 #endif
 
-#ifdef NEEDBUNDERSCORE
+#ifdef OPENBLAS_NEEDBUNDERSCORE
 #define BLASFUNC(FUNC) FUNC##_
 #else
 #define BLASFUNC(FUNC) FUNC
 #endif
 
-#ifdef QUAD_PRECISION
+#ifdef OPENBLAS_QUAD_PRECISION
 typedef struct {
   unsigned long x[2];
 }  xdouble;
-#elif defined EXPRECISION
+#elif defined OPENBLAS_EXPRECISION
 #define xdouble long double
 #else
 #define xdouble double
 #endif
 
-#if defined(OS_WINDOWS) && defined(__64BIT__)
+#if defined(OPENBLAS_OS_WINDOWS) && defined(OPENBLAS___64BIT__)
 typedef long long BLASLONG;
 typedef unsigned long long BLASULONG;
 #else
@@ -34,7 +34,7 @@ typedef long BLASLONG;
 typedef unsigned long BLASULONG;
 #endif
 
-#ifdef USE64BITINT
+#ifdef OPENBLAS_USE64BITINT
 typedef BLASLONG blasint;
 #else
 typedef int blasint;