diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
tree | d5c2a62c4db97de94f92150340612c64d3997669 /spectro/munki.c | |
parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/munki.c')
-rwxr-xr-x[-rw-r--r--] | spectro/munki.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spectro/munki.c b/spectro/munki.c index 16cd863..306f1dc 100644..100755 --- a/spectro/munki.c +++ b/spectro/munki.c @@ -49,6 +49,7 @@ #include "sa_config.h" #include "numsup.h" #endif /* SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -1012,7 +1013,7 @@ munki_del(inst *pp) { } /* Constructor */ -extern munki *new_munki(icoms *icom, instType itype) { +extern munki *new_munki(icoms *icom, instType dtype) { munki *p; int rv; if ((p = (munki *)calloc(sizeof(munki),1)) == NULL) { @@ -1043,7 +1044,7 @@ extern munki *new_munki(icoms *icom, instType itype) { p->del = munki_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; /* Preliminary capabilities */ munki_determine_capabilities(p); |