mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 20:19:00 +08:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
--- a/src/blas/f2c.h Fri Sep 11 18:57:56 2015
|
|
+++ b/src/blas/f2c.h Thu Dec 22 18:20:08 2016
|
|
@@ -190,18 +190,18 @@
|
|
typedef struct Namelist Namelist;
|
|
|
|
/* The following undefs are to prevent conflicts with external libraries */
|
|
-#undef abs
|
|
-#define abs(x) ((x) >= 0 ? (x) : -(x))
|
|
-#define dabs(x) (doublereal)abs(x)
|
|
-#ifndef min
|
|
-#define min(a,b) ((a) <= (b) ? (a) : (b))
|
|
-#define max(a,b) ((a) >= (b) ? (a) : (b))
|
|
-#endif
|
|
-#define dmin(a,b) (doublereal)min(a,b)
|
|
-#define dmax(a,b) (doublereal)max(a,b)
|
|
-#define bit_test(a,b) ((a) >> (b) & 1)
|
|
-#define bit_clear(a,b) ((a) & ~((uinteger)1 << (b)))
|
|
-#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))
|
|
+//#undef abs
|
|
+//#define abs(x) ((x) >= 0 ? (x) : -(x))
|
|
+//#define dabs(x) (doublereal)abs(x)
|
|
+//#ifndef min
|
|
+//#define min(a,b) ((a) <= (b) ? (a) : (b))
|
|
+//#define max(a,b) ((a) >= (b) ? (a) : (b))
|
|
+//#endif
|
|
+//#define dmin(a,b) (doublereal)min(a,b)
|
|
+//#define dmax(a,b) (doublereal)max(a,b)
|
|
+//#define bit_test(a,b) ((a) >> (b) & 1)
|
|
+//#define bit_clear(a,b) ((a) & ~((uinteger)1 << (b)))
|
|
+//#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))
|
|
|
|
/* procedure parameter types for -A and -C++ */
|
|
|