From bc7b318ed0960edeb4537797dd8c91de0d942ca9 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Fri, 22 Mar 2013 17:18:58 -0500 Subject: [PATCH] Added cpp guards to conflicting libflame typedefs. Details: - Added cpp guards around the definitions of dim_t, scomplex, and dcomplex. This is a temporary hack to allow interoperability with libflame. (Similarly temporary changes are being made to libflame's type definitions file.) --- frame/include/bl2_type_defs.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/frame/include/bl2_type_defs.h b/frame/include/bl2_type_defs.h index edfb4348f..e9a573dda 100644 --- a/frame/include/bl2_type_defs.h +++ b/frame/include/bl2_type_defs.h @@ -230,7 +230,12 @@ typedef signed long int bool_t; // Integer types +// This cpp guards provide a temporary hack to allow libflame +// interoperability with BLIS. +#ifndef _DEFINED_DIM_T +#define _DEFINED_DIM_T typedef unsigned long int dim_t; // dimension type +#endif typedef unsigned long int inc_t; // increment/stride type typedef signed long int doff_t; // diagonal offset type typedef unsigned long int siz_t; // byte size type @@ -238,17 +243,27 @@ typedef unsigned long int info_t; // object information bit field // Complex types -typedef struct scomplex_s +// This cpp guards provide a temporary hack to allow libflame +// interoperability with BLIS. +#ifndef _DEFINED_SCOMPLEX +#define _DEFINED_SCOMPLEX +typedef struct { float real; float imag; } scomplex; +#endif -typedef struct dcomplex_s +// This cpp guards provide a temporary hack to allow libflame +// interoperability with BLIS. +#ifndef _DEFINED_DCOMPLEX +#define _DEFINED_DCOMPLEX +typedef struct { double real; double imag; } dcomplex; +#endif // Atom type // Note: atom types are used to hold "bufferless" scalar object values. Note