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/dtp20.c | |
| parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
| parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/dtp20.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/dtp20.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spectro/dtp20.c b/spectro/dtp20.c index a125a53..c33dc3d 100644..100755 --- a/spectro/dtp20.c +++ b/spectro/dtp20.c @@ -67,6 +67,7 @@ #include "sa_config.h" #endif /* SALONEINSTLIB */ #include "numsup.h" +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -1737,7 +1738,7 @@ inst_opt_type m, /* Requested status type */ } /* Constructor */ -extern dtp20 *new_dtp20(icoms *icom, instType itype) { +extern dtp20 *new_dtp20(icoms *icom, instType dtype) { dtp20 *p; if ((p = (dtp20 *)calloc(sizeof(dtp20),1)) == NULL) { a1loge(icom->log, 1, "new_dtp20: malloc failed!\n"); @@ -1761,7 +1762,7 @@ extern dtp20 *new_dtp20(icoms *icom, instType itype) { p->del = dtp20_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; p->cap = inst_mode_none; /* Unknown until set */ p->mode = inst_mode_none; /* Not in a known mode yet */ |