Remove useless preprocessor conditions

include/main.h

@@ -13,9 +13,7 @@
 /* ================================================================================= */
 #include <math.h>
 #include <complex.h>
-#ifdef HAVE_HMAT
 #include "hmat/hmat.h"
-#endif
 #include "util.h"
 
 /*! \brief Number of right hand sides for the test */
@@ -58,28 +56,6 @@ typedef struct {
   int colDim;
 } contextTestFEMBEM;
 
-#ifndef HAVE_HMAT
-// If we compile without hmat, we need these phony declarations to use prepare_block()/advanced_compute_hmat() in computeDenseBlockFEMBEM()
-typedef struct hmat_block_info_struct {
-  void * user_data;
-  void (*release_user_data)(void*);
-  char (*is_guaranteed_null_row)(const struct hmat_block_info_struct * block_info, int block_row_offset, int stratum);
-  char (*is_guaranteed_null_col)(const struct hmat_block_info_struct * block_info, int block_col_offset, int stratum);
-} hmat_block_info_t;
-struct hmat_block_compute_context_t {
-  void* user_data;
-  int row_start, row_count, col_start, col_count;
-  int stratum;
-  void* block;
-};
-typedef enum {
-  hmat_factorization_none = -1,
-  hmat_factorization_lu,
-  hmat_factorization_ldlt,
-  hmat_factorization_llt
-} hmat_factorization_t;
-#endif
-
 int computeKernelBEM(double *coord1, double *coord2, int self, double _Complex *kernel) ;
 int produitClassiqueBEM(int ffar, void *sol) ;
 int produitClassique(void **sol) ;
@@ -104,7 +80,6 @@ void prepare_hmat(int, int, int, int, int*, int*, int*, int*, void*, hmat_block_
 void advanced_compute_hmat(struct hmat_block_compute_context_t*);
 int init_hmat_interface() ;
 
-#ifdef HAVE_HMAT
 struct HMAT_desc_s;
 typedef struct HMAT_desc_s HMAT_desc_t;
 
@@ -119,5 +94,4 @@ struct HMAT_desc_s {
 HMAT_desc_t *HMAT_generate_matrix( hmat_interface_t *hi );
 void         HMAT_destroy_matrix ( hmat_interface_t *hi,
                                    HMAT_desc_t      *hdesc );
-#endif