Skip to content

Commit

Permalink
fixed redefs
Browse files Browse the repository at this point in the history
  • Loading branch information
mbrazeau committed Mar 16, 2018
1 parent e81d87e commit d3ab3e7
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/morphydefs.h
Expand Up @@ -47,7 +47,7 @@ typedef unsigned int MPLstate;
steer pretty clear of epsilon */

typedef struct MPLndsets MPLndsets;
typedef struct partition_s MPLpartition;
typedef struct MPLpartition MPLpartition;
// Evaluator function pointers
typedef int (*MPLdownfxn)
(MPLndsets* lset,
Expand Down Expand Up @@ -112,8 +112,7 @@ typedef struct {
} MPLcupdate;


typedef struct partition_s MPLpartition;
typedef struct partition_s {
struct MPLpartition {

MPLchtype chtype; /*!< The optimality type used for this partition. */
bool isNAtype; /*!< This character should be treated as having inapplicable data. */
Expand Down Expand Up @@ -147,11 +146,10 @@ typedef struct partition_s {
MPLloclfxn loclfxn;
MPLpartition* next;

} MPLpartition;

};


typedef struct MPLndsets {
struct MPLndsets {

bool updated;
int steps_to_recall;
Expand All @@ -171,7 +169,7 @@ typedef struct MPLndsets {
char** upp1str;
char** upp2str;

} MPLndsets;
};


typedef struct mpl_matrix_s {
Expand Down

0 comments on commit d3ab3e7

Please sign in to comment.