CBLAS: Fix warning if some macros are already defined by user

Author: besser82

CBLAS/include/cblas.h

@@ -10,11 +10,13 @@ extern "C" {            /* Assume C declarations for C++ */
 /*
  * Enumerated and derived types
  */
+#ifndef CBLAS_INDEX
 #ifdef WeirdNEC
    #define CBLAS_INDEX long
 #else
     #define CBLAS_INDEX int
 #endif
+#endif
 
 typedef enum {CblasRowMajor=101, CblasColMajor=102} CBLAS_LAYOUT;
 typedef enum {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113} CBLAS_TRANSPOSE;

CBLAS/include/cblas_f77.h

@@ -17,7 +17,7 @@
    #define F77_STRLEN(a) (_fcdlen)
 #endif
 
-#ifdef WeirdNEC
+#if defined(WeirdNEC) && !defined(F77_INT)
    #define F77_INT long
 #endif