From c81f41694bcffccf38e17a63627a862628294613 Mon Sep 17 00:00:00 2001 From: Greg Landrum Date: Mon, 1 May 2023 14:50:05 +0200 Subject: [PATCH] a bit of modernization (#39) * cleanup prototypes * change minimum cmake version --- tightbind/CMakeLists.txt | 2 +- tightbind/bind.h | 4 +++- tightbind/prototypes.h | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tightbind/CMakeLists.txt b/tightbind/CMakeLists.txt index d32840e3..31af3ebf 100644 --- a/tightbind/CMakeLists.txt +++ b/tightbind/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.0) project(yaehmop C) diff --git a/tightbind/bind.h b/tightbind/bind.h index 27673e72..17dcc07e 100644 --- a/tightbind/bind.h +++ b/tightbind/bind.h @@ -74,7 +74,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -//#include +#ifndef _MSC_VER +#include +#endif #include #include diff --git a/tightbind/prototypes.h b/tightbind/prototypes.h index 8052056a..e96f57e8 100644 --- a/tightbind/prototypes.h +++ b/tightbind/prototypes.h @@ -136,7 +136,7 @@ extern void construct_band_structure PROTO( extern void eval_charge_matrix PROTO((cell_type *, eigenset_type, hermetian_matrix_type, int, int *, real *, real *)); -extern void reduced_charge_matrix PROTO((int, int, int *, real *, real *)); +extern void reduced_charge_mat PROTO((int, int, int *, real *, real *)); extern void check_a_cell PROTO((atom_type *, point_type, int, real, char *)); extern void check_nn_contacts PROTO((cell_type *, detail_type *details)); extern void build_distance_matrix PROTO((cell_type *, detail_type *details)); @@ -349,8 +349,8 @@ extern void gen_k_point_mesh PROTO((point_type * *points, int num_per_vect[3], real offset)); extern void automagic_k_points PROTO((detail_type * details, cell_type *cell)); -extern void set_details_defaults PROTO((detail_type*)); -extern void set_cell_defaults PROTO((cell_type*)); +extern void set_details_defaults PROTO((detail_type *)); +extern void set_cell_defaults PROTO((cell_type *)); extern void run_bind PROTO((char *, bool, char *)); extern void run_eht PROTO((FILE *)); @@ -381,4 +381,3 @@ extern int zheev_ PROTO((char *jobz, char *uplo, integer *n, doublecomplex *a, integer *lda, doublereal *w, doublecomplex *work, integer *lwork, doublereal *rwork, integer *info)); #endif -